Always repaint the gray area below main inset

[lyx.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 523b4c60ade1e78d2aa7d53b80633a44cf73004a..8e8942af3b1515b2222fd6ed13d6c0e32b2982ff 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,65 +1,75 @@
 #!/bin/sh
 
-ACLOCAL=aclocal
-AUTOHEADER=autoheader
-AUTOMAKE="automake -a -c --foreign"
-AUTOCONF=autoconf
+ACLOCAL="aclocal -I m4 -I config"
+AUTOHEADER="autoheader"
+AUTOMAKE="automake --add-missing --force-missing --copy --foreign"
+AUTOCONF="autoconf"
+
+# Discover what version of automake we are using.
+automake_version=$($AUTOMAKE --version 2>/dev/null | head -n 1)
+
+if test "$automake_version" != ""; then
+    echo "Using $automake_version"
+else
+    echo "LyX requires automake >= 1.14"
+    exit 1
+fi
+
+# Discover what version of autoconf we are using.
+autoversion=$($AUTOCONF --version 2>/dev/null | head -n 1)
+
+if test "$autoversion" != ""; then
+    echo "Using $autoversion"
+else
+    echo "LyX requires autoconf >= 2.65"
+    exit 1
+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
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
-       echo "Building macros."
-       $ACLOCAL ; (cd lib/reLyX; $ACLOCAL )
+echo "Building macros..."
+if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
+       $ACLOCAL
 else
        echo "aclocal not found -- aborting"
-       exit
+       exit 1
 fi
 
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
-       echo "Building config header template"
+echo "Building config header template..."
+if ( $AUTOHEADER --version ) < /dev/null > /dev/null 2>&1; then
        $AUTOHEADER
 else
        echo "autoheader not found -- aborting"
-       exit
+       exit 1
 fi
 
-if ( $AUTOMAKE --version ) </dev/null > /dev/null 2>&1; then
-       echo "Building Makefile templates"
-       $AUTOMAKE ; (cd lib/reLyX ; $AUTOMAKE )
+echo "Building Makefile templates..."
+if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
+       $AUTOMAKE
 else
        echo "automake not found -- aborting"
-       exit
+       exit 1
 fi
 
-if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
-       echo "Building configure"
-       $AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF )
-       echo 'run "./configure ; make"'
+echo "Building configure..."
+if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
+       $AUTOCONF
 else
        echo "autoconf not found -- aborting"
-       exit
+       exit 1
 fi
 
-echo "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 -n | uniq >> tmppot
-mv tmppot po/POTFILES.in
-echo "done"
-
-
-
-
+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