1Fix broken autoreconf 2 3Downloaded from upstream git 4https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 5 6Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 7 8 9From: Tim Terriberry <tterribe@xiph.org> 10Date: Fri, 20 May 2011 20:41:50 +0000 (+0000) 11Subject: Make autoreconf -i -f work. 12X-Git-Url: https://git.xiph.org/?p=theora.git;a=commitdiff_plain;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 13 14Make autoreconf -i -f work. 15 16Patch from David Schleef. 17 18svn path=/trunk/theora/; revision=17990 19--- 20 21diff --git a/Makefile.am b/Makefile.am 22index 89fd753..1783857 100644 23--- a/Makefile.am 24+++ b/Makefile.am 25@@ -4,6 +4,8 @@ 26 #AUTOMAKE_OPTIONS = foreign 1.7 dist-zip dist-bzip2 27 AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz 28 29+ACLOCAL_AMFLAGS=-I m4 30+ 31 if THEORA_ENABLE_EXAMPLES 32 EXAMPLES_DIR = examples 33 else 34diff --git a/configure.ac b/configure.ac 35index 1cbec1a..456b603 100644 36--- a/configure.ac 37+++ b/configure.ac 38@@ -68,7 +68,7 @@ AC_LIBTOOL_WIN32_DLL 39 AM_PROG_LIBTOOL 40 41 dnl Add parameters for aclocal 42-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") 43+AC_CONFIG_MACRO_DIR([m4]) 44 45 dnl Check for doxygen 46 AC_ARG_ENABLE([doc], 47