contrib: fix live555 build on osx

diff --git a/contrib/TODO b/contrib/TODO
index 48e4029e976c8b966750124f4ae31d93c9d33dc1..5b17fc906bfc180a7e4558073ffa04efef6265b5 100644 (file)
--- a/contrib/TODO
+++ b/contrib/TODO
@@ -11,9 +11,6 @@ dvdcss
 gnutls, gpg-error
     infrastructure mismatch between Makefile.in.in and autoconf macros (different gettext vers)
 
-live555
-    use old libtool options (/usr/bin/libtool), we use GNU
-
 ### Missing software for MacOSX (was present in extras/contrib)
 
 # These 3 are binary framework downloads : no source code is used

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index a1af0da661ea15b62c4ce470b99000394c2ccb7d..a26798163f5e3b0a27caa4f7ad54534784a3a1a9 100644 (file)
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -44,6 +44,9 @@ endif
 .live555: live555
 ifdef HAVE_WINCE
        cd $< && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw
+endif
+ifdef HAVE_MACOSX
+       cd $< && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
 endif
        cd $< && sed \
                -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \