X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=0365a10165f105d4c6198c1508c90f7f5e162709;hb=2e32e2c1239fcb966f9eefc7926edf602b2ad9d8;hp=31494bbc79d1dd2c6b239a990c4cc17c85ad63f9;hpb=c30c9a9e478b91d6438b9c1a42d789844a2691de;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 31494bbc79..0365a10165 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,132 +1,97 @@
 #!/bin/sh
 
-ACLOCAL="aclocal -I ${PWD}/m4"
+ACLOCAL="aclocal -I m4 -I config"
 AUTOHEADER="autoheader"
-AUTOMAKE="automake --add-missing --copy --foreign"
+AUTOMAKE="automake --add-missing --force-missing --copy --foreign"
 AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 pkg.m4 qt.m4 qt4.m4 spell.m4"
 
 # Discover what version of automake we are using.
-automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
+automake_version=$($AUTOMAKE --version 2>/dev/null | head -n 1)
 
-test "$automake_version" != "" && {
+if test "$automake_version" != ""; then
     echo "Using $automake_version"
-} || {
-    echo "LyX requires automake >= 1.9"
+else
+    echo "LyX requires automake >= 1.14"
     exit 1
-}
+fi
 
 case $automake_version in
-    *' '1.9*)
+    *' '1.1[456]*)
 	;;
     *)
-
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.9."
+	echo "LyX only supports automake 1.14 through 1.16."
 	exit 1
 	;;
 esac
 
 # Discover what version of autoconf we are using.
-autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
+autoversion=$($AUTOCONF --version 2>/dev/null | head -n 1)
 
-test "$autoversion" != "" && {
+if test "$autoversion" != ""; then
     echo "Using $autoversion"
-} || {
-    echo "LyX requires autoconf >= 2.52"
+else
+    echo "LyX requires autoconf >= 2.65"
     exit 1
-}
+fi
 
 case $autoversion in
-    *' '2.5[2-9])
-	EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
+    *' '2.6[5-9])
+	;;
+    *' '2.71)
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.5[2-9]."
+	echo "LyX only supports autoconf 2.65-2.69, 2.71."
 	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 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
-(cd config ; cat ${ACINCLUDE_FILES} ${EXTRA_ACINCLUDE_FILES} >../acinclude.m4)
-echo "done."
-
 # 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..."
+if ( make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in ); then
+    :
+else
+	echo "Building po/POTFILES.in failed -- aborting"
+	exit 1
+fi
+
 echo
-echo 'run "./configure ; make"'
+echo 'run "./configure && make"'
 echo