diff options
| author | saintdev <[email protected]> | 2008-06-18 00:55:37 +0000 |
|---|---|---|
| committer | saintdev <[email protected]> | 2008-06-18 00:55:37 +0000 |
| commit | a80510e373cc9a16183020caa1f258a9f636cf25 (patch) | |
| tree | 477e034dc16b4935a8be0b46cb27679959c0134e /contrib | |
| parent | 38caefc2fe0038f9b57adcac59ed1876c5bdb6e3 (diff) | |
Fix building of faad2 with libtool 2.2.x
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1525 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Jamfile | 2 | ||||
| -rw-r--r-- | contrib/patch-faad2-libtool22.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index 289d7c507..0b4b846e8 100644 --- 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 index 000000000..4eab08487 --- /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 |