X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=ccb2c002dce7c82435af0bca124c95bebcc5da2f;hb=c22d1bb43069c4f7736dd6a4f8a38831d97d9ad8;hp=b30a91d19ef6b23c70a5424ddff7e0d1f416922c;hpb=5971c1a9f13e7e132377ea1fa5213c51210ee68d;p=features.git diff --git a/autogen.sh b/autogen.sh index b30a91d19e..ccb2c002dc 100755 --- 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..."