Fix building of faad2 with libtool 2.2.x

git-svn-id: svn://localhost/HandBrake/trunk@1525 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 289d7c5..0b4b846 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -68,7 +68,7 @@ actions LibFaad2
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf faad2 && (gzip -dc faad2.tar.gz | tar xf -) &&
-    cd faad2 &&
+    cd faad2 && $(PATCH) -p1 < ../patch-faad2-libtool22.patch &&
     ./bootstrap && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared && $(MAKE) && $(MAKE) install
 }
 Wget     $(SUBDIR)/faad2.tar.gz    : $(SUBDIR)/version_faad2.txt ;

diff --git a/contrib/patch-faad2-libtool22.patch b/contrib/patch-faad2-libtool22.patch
new file mode 100644 (file)
index 0000000..4eab084
--- /dev/null
+++ b/contrib/patch-faad2-libtool22.patch
@@ -0,0 +1,13 @@
+Index: faad2/configure.in
+===================================================================
+--- faad2.orig/configure.in
++++ faad2/configure.in
+@@ -18,7 +18,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CPP
+ dnl disable for mpeg4ip plugin
+-dnl AC_PROG_CXX
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET