X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=0b75d7be01b4f15d7cebe68a6921e547f81ba700;hb=245426421648387f14846f5cbe6002f605d272ec;hp=abdf7f0e146ab32ade1c69ff4d326c3f16299135;hpb=78c2dddb78e371c5ff7f192c9df8b0be986d5dc8;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index abdf7f0e14..0b75d7be01 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,40 +1,26 @@
 #!/bin/sh
 
-ACLOCAL=aclocal
+ACLOCAL="aclocal -I ${PWD}/m4"
 AUTOHEADER="autoheader"
 AUTOMAKE="automake -a -c --foreign"
 AUTOCONF="autoconf"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"
 
 # Discover what version of autoconf we are using.
 autoversion=`$AUTOCONF --version | head -n 1`
 
 echo "Using $autoversion"
 case $autoversion in
-    *2.13)
-	cp config/acconfig.h .
-	cp config/configure.in .
-	rm -f configure.ac
-	cp config/relyx_configure.in lib/reLyX/configure.in
-	rm -f lib/reLyX/configure.ac
-	;;
-    *2.5[23])
-	rm -f acconfig.h
-	rm -f configure.in
-	cp config/configure.ac .
-	rm -f lib/reLyX/configure.in
-	cp config/relyx_configure.ac lib/reLyX/configure.ac
+    *2.5[2-9])
+	EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.13 and 2.53."
+	echo "LyX only supports autoconf 2.5[2-9]."
 	exit
 	;;
 esac
 
-
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 pkg.m4"
-SIGCPP_ACINCLUDE_FILES="libtool.m4"
-
 echo -n "Locating GNU m4... "
 GNUM4=
 for prog in $M4 gm4 gnum4 m4; do
@@ -58,7 +44,7 @@ fi
 # Generate acinclude.m4
 echo -n "Generate acinclude.m4... "
 rm -f acinclude.m4
-(cd config ; cat ${ACINCLUDE_FILES} >../acinclude.m4)
+(cd config ; cat ${ACINCLUDE_FILES} ${EXTRA_ACINCLUDE_FILES} >../acinclude.m4)
 echo "done."
 
 # Generate the Makefiles and configure files