[xiph-commits] r17990 - trunk/theora

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2011-05-20 13:41:50 -0700 (Fri, 20 May 2011)
New Revision: 17990

Modified:
   trunk/theora/Makefile.am
   trunk/theora/configure.ac
Log:
Make autoreconf -i -f work.

Patch from David Schleef.


Modified: trunk/theora/Makefile.am
===================================================================
--- trunk/theora/Makefile.am	2011-05-19 14:30:15 UTC (rev 17989)
+++ trunk/theora/Makefile.am	2011-05-20 20:41:50 UTC (rev 17990)
@@ -4,6 +4,8 @@
 #AUTOMAKE_OPTIONS = foreign 1.7 dist-zip dist-bzip2
 AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
 
+ACLOCAL_AMFLAGS=-I m4
+
 if THEORA_ENABLE_EXAMPLES
 EXAMPLES_DIR = examples
 else

Modified: trunk/theora/configure.ac
===================================================================
--- trunk/theora/configure.ac	2011-05-19 14:30:15 UTC (rev 17989)
+++ trunk/theora/configure.ac	2011-05-20 20:41:50 UTC (rev 17990)
@@ -68,7 +68,7 @@
 AM_PROG_LIBTOOL
 
 dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl Check for doxygen
 AC_ARG_ENABLE([doc],