* dirty patch to tell vlc (on osx) that it needs -liconv when it links to libcdio...

diff --git a/configure.ac b/configure.ac
index fd4a251673aed3602cb05099965871affd729e39..57bf9a93b313e23745c54e93e94d396f4e9a0469 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1720,7 +1720,8 @@ then
   if test "${SYS}" = "darwin"
   then
     VLC_ADD_PLUGINS([vcd cdda])
-    VLC_ADD_LDFLAGS([vcd vcdx cdda],[-framework IOKit -framework CoreFoundation])
+    VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-framework IOKit -framework CoreFoundation])
+    VLC_ADD_LDFLAGS([vcdx cddax],[-liconv])
   fi
 fi
 

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 08eb0368573b5b33298f2d98e8ac94987c88aa67..001dd014252e1e630c4f836c6ea8511a7e78cac7 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -923,7 +923,7 @@ libcddb: libcddb-$(CDDB_VERSION).tar.gz
        patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
-       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="-L$(PREFIX)/lib -liconv" && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)
        touch $@
 
 CLEAN_FILE += .cddb