use "aclocal -I config" instead of acinclude.m4. Now configure will be rebuilt automa...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18032 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/Makefile.am b/Makefile.am
index 8416b56b1d6cd1b57e34f467880ca2b5aa516bfe..a617a46aac2d5fd9f4dafb9c8fef5ec17c5994bf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
 include $(top_srcdir)/config/common.am
 
+ACLOCAL_AMFLAGS = -I m4 -I config
+
 DISTCLEANFILES += lyx.1 config.status config.cache config.log
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-       $(srcdir)/configure \
-       $(srcdir)/acinclude.m4
+       $(srcdir)/configure
 
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
@@ -66,4 +67,3 @@ lgbtags:
 
 .PHONY: doxydoc
 
-ACLOCAL_AMFLAGS = -I m4

diff --git a/autogen.sh b/autogen.sh
index b30a91d19ef6b23c70a5424ddff7e0d1f416922c..ccb2c002dce7c82435af0bca124c95bebcc5da2f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
 
-ACLOCAL="aclocal -I ${PWD}/m4"
+ACLOCAL="aclocal -I m4 -I config"
 AUTOHEADER="autoheader"
 AUTOMAKE="automake --add-missing --copy --foreign"
 AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 pkg.m4 qt4.m4 spell.m4"
 
 # Discover what version of automake we are using.
 automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
@@ -71,12 +70,6 @@ fi
 # automake will stop if their contents was created by an earlier version.
 rm -rf autom4te.cache
 
-# Generate acinclude.m4
-echo -n "Generate acinclude.m4... "
-rm -f acinclude.m4
-(cd config ; cat ${ACINCLUDE_FILES} ${EXTRA_ACINCLUDE_FILES} >../acinclude.m4)
-echo "done."
-
 # Generate the Makefiles and configure files
 if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
        echo "Building macros..."