X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=autogen.sh;h=93be0416fd1f9604cf463add4fd3336d26ca2677;hb=e2ab5aa8e17ad1ecba32485acf9e9a08d38e9ee1;hp=26e1ce64cd01b2b6f9968c6b1e43d8a3f90d4d55;hpb=f20dd3e30e807d2d45202b84e2aed9f97888a685;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 26e1ce64cd..93be0416fd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,16 +1,41 @@
 #!/bin/sh
 
+# Discover what version of autoconf we are using.
+autoversion=`autoconf --version | head -n 1`
+
+case $autoversion in
+    *2.13)
+	cp config/acconfig.h .
+	cp config/configure.in .
+	cp config/relyx_configure.in lib/reLyX/configure.in
+	;;
+    *2.53)
+	cp config/configure.ac .
+	cp config/relyx_configure.ac lib/reLyX/configure.ac
+	;;
+    *)
+	echo "You are running autoconf $autoversion, that"
+	echo "version is not supported by LyX."
+	echo "LyX only supports autoconf 2.13 and 2.53."
+	exit
+	;;
+esac
+
+
 ACLOCAL=aclocal
-AUTOHEADER=autoheader
+AUTOHEADER="autoheader"
 AUTOMAKE="automake -a -c --foreign"
-AUTOCONF=autoconf
+AUTOCONF="autoconf"
 GNUM4=
 
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt2.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
+	   GNUM4=$prog
 	   echo "found: $GNUM4"
 	   break ;;
     *) ;;
@@ -22,26 +47,29 @@ fi
 
 # Generate acinclude.m4
 echo -n "Generate acinclude.m4... "
-rm -rf acinclude.m4
-touch acinclude.m4
-for fil in config/lyxinclude.m4 config/libtool.m4 config/gettext.m4 config/lcmessage.m4 config/progtest.m4 ; do
-    cat $fil >> acinclude.m4
-done
+rm -f acinclude.m4
+(cd config ; cat ${ACINCLUDE_FILES} >../acinclude.m4)
 echo "done."
 
 # Generate the Makefiles and configure files
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building macros... "
-	$ACLOCAL ; (cd lib/reLyX; $ACLOCAL )
+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."
 else
 	echo "aclocal not found -- aborting"
 	exit
 fi
 
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building config header template... "
-	$AUTOHEADER
+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."
 else
 	echo "autoheader not found -- aborting"
@@ -49,8 +77,11 @@ else
 fi
 
 if ( $AUTOMAKE --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building Makefile templates... "
-	$AUTOMAKE ; (cd lib/reLyX ; $AUTOMAKE )
+	echo "Building Makefile templates..."
+	for dir in . lib/reLyX ; do
+	    echo "        $dir"
+	    ( cd $dir ; $AUTOMAKE )
+	done
 	echo "done."
 else
 	echo "automake not found -- aborting"
@@ -58,8 +89,11 @@ else
 fi
 
 if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building configure... "
-	$AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF )
+	echo "Building configure..."
+	for dir in . lib/reLyX ; do
+	    echo "       $dir"
+	    ( cd $dir ; $AUTOCONF )
+	done
 	echo "done."
 else
 	echo "autoconf not found -- aborting"
@@ -78,26 +112,6 @@ else
     exit
 fi
 
-echo -n "Creating POTFILES.in... "
-cat <<EOF > tmppot
-#
-# This file is automatically generated by autogen.sh. This command was
-# used to extract the files from the sources:
-#
-# grep -E "_\(\".*\"\)" \`find src -name \*.[hHC]\` | \\
-# awk 'BEGIN {FS= ":"} {print $1}' | sort | uniq
-#
-# This must be done when standing in lyx/
-#
-# This is all the files that contains internationalization strings.
-
-EOF
-
-grep -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
-awk 'BEGIN {FS= ":"} {print $1}' | sort -f -d | uniq >> tmppot
-mv tmppot po/POTFILES.in
-echo "done"
-
 echo
 echo 'run "./configure ; make"'
 echo