X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=2e545dd935a06d4e4f356e6a208e7dbf1d5dc018;hb=865face4251fd7cb664ac2b25fca350d3db6f0ab;hp=0b75d7be01b4f15d7cebe68a6921e547f81ba700;hpb=225610e3e080c84d2220e366425bc35c0ee2cf26;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 0b75d7be01..2e545dd935 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,22 +2,49 @@
 
 ACLOCAL="aclocal -I ${PWD}/m4"
 AUTOHEADER="autoheader"
-AUTOMAKE="automake -a -c --foreign"
+AUTOMAKE="automake --add-missing --copy --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"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 spell.m4 pkg.m4"
 
+# Discover what version of automake we are using.
+automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
+
+test "$automake_version" != "" && {
+    echo "Using $automake_version"
+} || {
+    echo "LyX requires automake >= 1.9"
+    exit 1
+}
+
+case $automake_version in
+    *' '1.9*)
+	;;
+    *)
+    
+	echo "This automake version is not supported by LyX."
+        echo "LyX only supports automake 1.9."
+        exit 1
+        ;;
+esac
+							
 # Discover what version of autoconf we are using.
-autoversion=`$AUTOCONF --version | head -n 1`
+autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
 
-echo "Using $autoversion"
+test "$autoversion" != "" && {
+    echo "Using $autoversion"
+} || {
+    echo "LyX requires autoconf >= 2.52"
+    exit 1
+}
+	    
 case $autoversion in
-    *2.5[2-9])
+    *' '2.5[2-9])
 	EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
 	echo "LyX only supports autoconf 2.5[2-9]."
-	exit
+	exit 1
 	;;
 esac
 
@@ -36,11 +63,15 @@ for prog in $M4 gm4 gnum4 m4; do
 done
 if test x$GNUM4 = x ; then
 	echo "not found."
-	exit
+	exit 1
 else
 	echo `which $GNUM4`
 fi
 
+# Delete old cache directories.
+# 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
@@ -50,14 +81,14 @@ echo "done."
 # Generate the Makefiles and configure files
 if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building macros..."
-	for dir in . lib/reLyX ; do
+	for dir in . ; do
 	    echo "        $dir"
 	    ( cd $dir ; $ACLOCAL )
 	done
 	echo "done."
 else
 	echo "aclocal not found -- aborting"
-	exit
+	exit 1
 fi
 
 if ( $AUTOHEADER --version ) < /dev/null > /dev/null 2>&1; then
@@ -69,40 +100,33 @@ if ( $AUTOHEADER --version ) < /dev/null > /dev/null 2>&1; then
 	echo "done."
 else
 	echo "autoheader not found -- aborting"
-	exit
+	exit 1
 fi
 
 if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building Makefile templates..."
-	for dir in . lib/reLyX ; do
+	for dir in . ; do
 	    echo "        $dir"
 	    ( cd $dir ; $AUTOMAKE )
 	done
 	echo "done."
 else
 	echo "automake not found -- aborting"
-	exit
+	exit 1
 fi
 
 if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building configure..."
-	for dir in . lib/reLyX ; do
+	for dir in . ; do
 	    echo "       $dir"
 	    ( cd $dir ; $AUTOCONF )
 	done
 	echo "done."
 else
 	echo "autoconf not found -- aborting"
-	exit
+	exit 1
 fi
 
-# Autogenerate lib/configure.m4.
-echo -n "Building lib/configure ... "
-rm -f lib/configure
-$GNUM4 lib/configure.m4 > lib/configure
-chmod a+x lib/configure
-echo "done."
-
 echo
 echo 'run "./configure ; make"'
 echo