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