X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=4350394d2a24c399d69135c142844dd770214f0a;hb=07c9c4dc6ea08852cf89674921d1e7a5cecd5697;hp=ccb2c002dce7c82435af0bca124c95bebcc5da2f;hpb=c22d1bb43069c4f7736dd6a4f8a38831d97d9ad8;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index ccb2c002dc..4350394d2a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,17 +11,17 @@ automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
 test "$automake_version" != "" && {
     echo "Using $automake_version"
 } || {
-    echo "LyX requires automake >= 1.9"
+    echo "LyX requires automake >= 1.5"
     exit 1
 }
 
 case $automake_version in
-    *' '1.9*|*' '1.10*)
+    *' '1.[5-9]*|*' '1.10*)
 	;;
     *)
 
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.9 and 1.10."
+	echo "LyX only supports automake 1.5 to 1.10."
 	exit 1
 	;;
 esac
@@ -37,7 +37,7 @@ test "$autoversion" != "" && {
 }
 
 case $autoversion in
-    *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-1])
+    *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-2])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
@@ -46,79 +46,46 @@ case $autoversion in
 	;;
 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 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 the Makefiles and configure files
+echo "Building macros..."
 if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
-	echo "Building macros..."
-	for dir in . ; do
-	    echo "        $dir"
-	    ( cd $dir ; $ACLOCAL )
-	done
-	echo "done."
+	$ACLOCAL
 else
 	echo "aclocal not found -- aborting"
 	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 1
 fi
 
+echo "Building Makefile templates..."
 if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
-	echo "Building Makefile templates..."
-	for dir in . ; do
-	    echo "        $dir"
-	    ( cd $dir ; $AUTOMAKE )
-	done
-	echo "done."
+	$AUTOMAKE
 else
 	echo "automake not found -- aborting"
 	exit 1
 fi
 
+echo "Building configure..."
 if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
-	echo "Building configure..."
-	for dir in . ; do
-	    echo "       $dir"
-	    ( cd $dir ; $AUTOCONF )
-	done
-	echo "done."
+	$AUTOCONF
 else
 	echo "autoconf not found -- aborting"
 	exit 1
 fi
 
+echo "Building po/POTFILES.in..."
+make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in
+
 echo
 echo 'run "./configure ; make"'
 echo