This patch modifies autogen.sh to return '1' rather than '0' when it exits abnormally.
OK to apply?


I have, however, an associated question. On Win32 I don't have gettext 0.12 installed. Instead I'm using the included version that comes with LyX (taken from gettext 0.14.1 apparently).

It seems to me that the gettext test shouldn't be in autogen.sh at all. Instead, the test should be made by the configure script. Agree?

Angus
Index: autogen.sh
===================================================================
RCS file: /cvs/lyx/lyx-devel/autogen.sh,v
retrieving revision 1.56
diff -u -a -u -r1.56 autogen.sh
--- autogen.sh  2005/02/24 08:49:34     1.56
+++ autogen.sh  2005/03/05 12:54:40
@@ -13,7 +13,7 @@
     echo "Using $gettext_version"
 } || {
     echo "LyX requires getttext >= 0.12"
-    exit
+    exit 1
 }
 
 case $gettext_version in
@@ -22,7 +22,7 @@
     *)
        echo "This gettext version is not supported by LyX."
        echo "LyX supports only gettext 0.1[2-4]."
-       exit
+       exit 1
        ;;
 esac
 
@@ -33,7 +33,7 @@
     echo "Using $automake_version"
 } || {
     echo "LyX requires automake >= 1.5"
-    exit
+    exit 1
 }
 
 case $automake_version in
@@ -43,7 +43,7 @@
     
        echo "This automake version is not supported by LyX."
         echo "LyX only supports automake 1.[5-9]."
-        exit
+        exit 1
         ;;
 esac
                                                        
@@ -54,7 +54,7 @@
     echo "Using $autoversion"
 } || {
     echo "LyX requires autoconf >= 2.52"
-    exit
+    exit 1
 }
            
 case $autoversion in
@@ -64,7 +64,7 @@
     *)
        echo "This autoconf version is not supported by LyX."
        echo "LyX only supports autoconf 2.5[2-9]."
-       exit
+       exit 1
        ;;
 esac
 
@@ -83,7 +83,7 @@
 done
 if test x$GNUM4 = x ; then
        echo "not found."
-       exit
+       exit 1
 else
        echo `which $GNUM4`
 fi
@@ -104,7 +104,7 @@
        echo "done."
 else
        echo "aclocal not found -- aborting"
-       exit
+       exit 1
 fi
 
 if ( $AUTOHEADER --version ) < /dev/null > /dev/null 2>&1; then
@@ -116,7 +116,7 @@
        echo "done."
 else
        echo "autoheader not found -- aborting"
-       exit
+       exit 1
 fi
 
 if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
@@ -128,7 +128,7 @@
        echo "done."
 else
        echo "automake not found -- aborting"
-       exit
+       exit 1
 fi
 
 if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
@@ -140,7 +140,7 @@
        echo "done."
 else
        echo "autoconf not found -- aborting"
-       exit
+       exit 1
 fi
 
 # Autogenerate lib/configure.m4.

Reply via email to