(Johnathan Burchill:) fix crash when pasting insets in change tracking mode [bug...

[lyx.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index abdf7f0e146ab32ade1c69ff4d326c3f16299135..c96884bd041a1e6e611177405e74d5bd383376cc 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,40 +1,73 @@
 #!/bin/sh
 
-ACLOCAL=aclocal
+ACLOCAL="aclocal -I ${PWD}/m4"
 AUTOHEADER="autoheader"
 AUTOMAKE="automake -a -c --foreign"
 AUTOCONF="autoconf"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"
 
+# Discover what version of gettext we are using.
+gettext_version=`gettext --version 2>/dev/null | head -n 1`
+
+test "$gettext_version" != "" && {
+    echo "Using $gettext_version"
+} || {
+    echo "LyX requires getttext >= 0.12"
+    exit
+}
+
+case $gettext_version in
+    *' '0.1[2-4]*)
+       ;;
+    *)
+       echo "This gettext version is not supported by LyX."
+       echo "LyX supports only gettext 0.1[2-4]."
+       exit
+       ;;
+esac
+
+# Discover what version of automake we are using.
+automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
+
+test "$automake_version" != "" && {
+    echo "Using $automake_version"
+} || {
+    echo "LyX requires automake >= 1.5"
+    exit
+}
+
+case $automake_version in
+    *' '1.[5-9]*)
+       ;;
+    *)
+    
+       echo "This automake version is not supported by LyX."
+        echo "LyX only supports automake 1.[5-9]."
+        exit
+        ;;
+esac
+                                                       
 # Discover what version of autoconf we are using.
-autoversion=`$AUTOCONF --version | head -n 1`
+autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
 
-echo "Using $autoversion"
+test "$autoversion" != "" && {
+    echo "Using $autoversion"
+} || {
+    echo "LyX requires autoconf >= 2.52"
+    exit
+}
+           
 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 "This autoconf version is not supported by LyX."
-       echo "LyX only supports autoconf 2.13 and 2.53."
+       echo "LyX only supports autoconf 2.5[2-9]."
        exit
        ;;
 esac
 
-
-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... "
 GNUM4=
 for prog in $M4 gm4 gnum4 m4; do
@@ -58,7 +91,7 @@ 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