X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=09d553484ba91254cda5a7da8b8092168fb9b9ec;hb=9c628d363a987920ba2cc30364ab520ee6571cb8;hp=3c1e8a6e4fd368f3e107230b79b5470f4f7a3c37;hpb=6ad8b3929ab5d1761a758edbfeb30ba8e190b137;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 3c1e8a6e4f..09d553484b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,63 +1,54 @@
 #!/bin/sh
 
+ACLOCAL="aclocal"
+AUTOHEADER="autoheader"
+AUTOMAKE="automake -a -c --foreign"
+AUTOCONF="autoconf"
+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 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"
+
 # Discover what version of autoconf we are using.
-autoversion=`autoconf --version | head -n 1`
+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 "You are running autoconf $autoversion, that"
-	echo "version is not supported by LyX."
-	echo "LyX only supports autoconf 2.13 and 2.53."
+	echo "This autoconf version is not supported by LyX."
+	echo "LyX only supports autoconf 2.5[2-9]."
 	exit
 	;;
 esac
 
-
-ACLOCAL=aclocal
-AUTOHEADER="autoheader"
-AUTOMAKE="automake -a -c --foreign"
-AUTOCONF="autoconf"
+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
 
-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... "
-for prog in $M4 gm4 gnum4 m4 ; do
-  case `$prog --version 2>&1` in
-    *GNU*) ok=yes
-	   GNUM4=$prog
-	   echo "found: $GNUM4"
-	   break ;;
-    *) ;;
-  esac
+	# /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$ok = xno ; then
-    echo "not found."
+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} >../acinclude.m4)
+(cd config ; cat ${ACINCLUDE_FILES} ${EXTRA_ACINCLUDE_FILES} >../acinclude.m4)
 echo "done."
 
 # Generate the Makefiles and configure files
-if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
+if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building macros..."
 	for dir in . lib/reLyX ; do
 	    echo "        $dir"
@@ -69,7 +60,7 @@ else
 	exit
 fi
 
-if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
+if ( $AUTOHEADER --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building config header template..."
 	for dir in . ; do
 	    echo "        $dir"
@@ -81,7 +72,7 @@ else
 	exit
 fi
 
-if ( $AUTOMAKE --version ) </dev/null > /dev/null 2>&1; then
+if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building Makefile templates..."
 	for dir in . lib/reLyX ; do
 	    echo "        $dir"
@@ -93,7 +84,7 @@ else
 	exit
 fi
 
-if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
+if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building configure..."
 	for dir in . lib/reLyX ; do
 	    echo "       $dir"
@@ -106,16 +97,11 @@ else
 fi
 
 # Autogenerate lib/configure.m4.
-if test x$GNUM4 != x ; then
-    echo -n "Building lib/configure ... "
-    rm -f lib/configure
-    $GNUM4 lib/configure.m4 > lib/configure
-    chmod a+x lib/configure
-    echo "done."
-else
-    echo "No GNU m4. Impossible to build lib/configure -- aborting"
-    exit
-fi
+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"'