[vlc-commits] commit: dirac: use autoreconf instead of custom script ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Nov  1 01:32:59 2010 +0100| [80d0bb5802e4478ac45f5144b890c3f3493e8450] | committer: Rafaël Carré 

dirac: use autoreconf instead of custom script

Fix use of ACLOCAL_AMFLAGS

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=80d0bb5802e4478ac45f5144b890c3f3493e8450
---

 extras/contrib/src/Patches/dirac-autotools.patch |   22 ++++++++++++++++++++++
 extras/contrib/src/contrib-src.mak               |    3 ++-
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Patches/dirac-autotools.patch b/extras/contrib/src/Patches/dirac-autotools.patch
new file mode 100644
index 0000000..54b40da
--- /dev/null
+++ b/extras/contrib/src/Patches/dirac-autotools.patch
@@ -0,0 +1,22 @@
+--- dirac/Makefile.am.orig	2010-11-01 01:31:21.638194470 +0100
++++ dirac/Makefile.am	2010-11-01 01:31:25.174196742 +0100
+@@ -1,6 +1,8 @@
+ # $Id: Makefile.am,v 1.22 2008/10/01 05:33:56 asuraparaju Exp $
+ #
+ 
++ACLOCAL_AMFLAGS= -I m4
++
+ SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder \
+           libdirac_decoder encoder decoder $(CPPUNITTESTS_DIR) \
+           tests $(DOC_DIR) win32
+--- dirac/configure.ac.orig	2010-11-01 01:26:21.058194985 +0100
++++ dirac/configure.ac	2010-11-01 01:32:22.062185299 +0100
+@@ -57,8 +57,6 @@
+ AM_PROG_LIBTOOL
+ AC_SYS_LARGEFILE
+ 
+-ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS"
+-AC_SUBST(ACLOCAL_AMFLAGS)
+ 
+ 
+ dnl -------------------------------------------------------------------------
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 5da5475..168534a 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2045,7 +2045,8 @@ ifdef HAVE_CYGWIN
 	patch -p0 < Patches/dirac-cygwin.patch
 endif
 	patch -p0 < Patches/dirac-noutils.patch
-	(cd $@; ./bootstrap)
+	patch -p0 < Patches/dirac-autotools.patch
+	(cd $@; autoreconf -ivf)
 
 DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder