X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=750d7a7bc590057c1c66cc776786476cbc978982;hb=a88e6e1ea5861f8275adbe4c962c2629fb482613;hp=20065e9545f991e6ebdd3b5f2772aa8f415312b3;hpb=21f3e98b96b75d18b17ea97edf2c84e4410537e3;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 20065e9545..750d7a7bc5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,30 +1,9 @@
 #!/bin/sh
 
-ACLOCAL="aclocal -I ${PWD}/m4"
+ACLOCAL="aclocal -I m4 -I config"
 AUTOHEADER="autoheader"
-AUTOMAKE="automake -a -c --foreign"
+AUTOMAKE="automake --add-missing --force-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"
-
-# Discover what version of gettext we are using.
-gettext_version=`gettext --version 2>/dev/null | head -n 1`
-
-test "$gettext_version" != "" && {
-    echo "Using $gettext_version"
-} || {
-    echo "LyX requires getttext >= 0.12"
-    exit
-}
-
-case $gettext_version in
-    *' '0.1[2-4]*)
-	;;
-    *)
-	echo "This gettext version is not supported by LyX."
-	echo "LyX supports only gettext 0.1[2-4]."
-	exit
-	;;
-esac
 
 # Discover what version of automake we are using.
 automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
@@ -32,124 +11,85 @@ automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
 test "$automake_version" != "" && {
     echo "Using $automake_version"
 } || {
-    echo "LyX requires automake >= 1.5"
-    exit
+    echo "LyX requires automake >= 1.8"
+    exit 1
 }
 
 case $automake_version in
-    *' '1.[5-7]*)
+    *' '1.[8-9]*|*' '1.1[01234]*)
 	;;
     *)
-    
+
 	echo "This automake version is not supported by LyX."
-        echo "LyX only supports automake 1.[5-7]."
-        exit
-        ;;
+	echo "LyX only supports automake 1.8 to 1.14."
+	exit 1
+	;;
 esac
-							
+
 # Discover what version of autoconf we are using.
 autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
 
 test "$autoversion" != "" && {
     echo "Using $autoversion"
 } || {
-    echo "LyX requires autoconf >= 2.52"
-    exit
+    echo "LyX requires autoconf >= 2.60"
+    exit 1
 }
-	    
+
+
 case $autoversion in
-    *' '2.5[2-9])
-	EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
+    *' '2.60[ab]|*' '2.6[0-9])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.5[2-9]."
-	exit
+	echo "LyX only supports autoconf 2.60-2.69."
+	exit 1
 	;;
 esac
 
-echo -n "Locating GNU m4... "
-GNUM4=
-for prog in $M4 gm4 gnum4 m4; do
-	# continue if $prog generates error (e.g. does not exist)
-	( $prog --version ) < /dev/null > /dev/null 2>&1
-	if test $? -ne 0 ; then continue; fi
-
-	# /dev/null input prevents a hang of the script for some m4 compilers (e.g. on FreeBSD)
-	case `$prog --version < /dev/null 2>&1` in
-	*GNU*)	GNUM4=$prog
-		break ;;
-	esac
-done
-if test x$GNUM4 = x ; then
-	echo "not found."
-	exit
-else
-	echo `which $GNUM4`
-fi
-
-# Generate acinclude.m4
-echo -n "Generate acinclude.m4... "
-rm -f acinclude.m4
-(cd config ; cat ${ACINCLUDE_FILES} ${EXTRA_ACINCLUDE_FILES} >../acinclude.m4)
-echo "done."
+# Delete old cache directories.
+# automake will stop if their contents was created by an earlier version.
+rm -rf autom4te.cache
 
 # Generate the Makefiles and configure files
+echo "Building macros..."
 if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
-	echo "Building macros..."
-	for dir in . lib/reLyX ; do
-	    echo "        $dir"
-	    ( cd $dir ; $ACLOCAL )
-	done
-	echo "done."
+	$ACLOCAL
 else
 	echo "aclocal not found -- aborting"
-	exit
+	exit 1
 fi
 
+echo "Building config header template..."
 if ( $AUTOHEADER --version ) < /dev/null > /dev/null 2>&1; then
-	echo "Building config header template..."
-	for dir in . ; do
-	    echo "        $dir"
-	    ( cd $dir ; $AUTOHEADER )
-	done
-	echo "done."
+	$AUTOHEADER
 else
 	echo "autoheader not found -- aborting"
-	exit
+	exit 1
 fi
 
+echo "Building Makefile templates..."
 if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
-	echo "Building Makefile templates..."
-	for dir in . lib/reLyX ; do
-	    echo "        $dir"
-	    ( cd $dir ; $AUTOMAKE )
-	done
-	echo "done."
+	$AUTOMAKE
 else
 	echo "automake not found -- aborting"
-	exit
+	exit 1
 fi
 
+echo "Building configure..."
 if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
-	echo "Building configure..."
-	for dir in . lib/reLyX ; do
-	    echo "       $dir"
-	    ( cd $dir ; $AUTOCONF )
-	done
-	echo "done."
+	$AUTOCONF
 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 "Building po/POTFILES.in..."
+if (! make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in ); then
+	echo "Building po/POTFILES.in failed -- aborting"
+	exit 1
+fi
 
 echo
-echo 'run "./configure ; make"'
+echo 'run "./configure && make"'
 echo