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

[features.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index e43a5f96ea7f199be93cabd3a6d5850de9dccf97..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 qt.m4 qt4.m4 spell.m4"
 
 # Discover what version of automake we are using.
 automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
@@ -39,7 +38,6 @@ test "$autoversion" != "" && {
 
 case $autoversion in
     *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-1])
-       EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
        ;;
     *)
        echo "This autoconf version is not supported by LyX."
@@ -72,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..."