X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=acinclude.m4;h=3f64fdb52562116f1fda720ce4c40f5f8edeab36;hp=0433f778edf2ceebb234780cabda5c0c12b7e0cf;hb=f34c614a1004090d199262127b138e19ced6e0c9;hpb=41c621e5d8dde2be654409249da04ca14eb71df2;ds=sidebyside

diff --git a/acinclude.m4 b/acinclude.m4
index 0433f778..3f64fdb5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -14,7 +14,6 @@ AC_DEFUN(GINAC_LIB_READLINE_VERSION,
 [AC_CACHE_CHECK([for version of libreadline], ginac_cv_rlversion, [
 AC_TRY_RUN([
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <readline/readline.h>
 
@@ -24,17 +23,17 @@ main()
     fd = fopen("conftest.out", "w");
     fprintf(fd, "%s\n", rl_library_version);
     fclose(fd);
-    exit(0);
-}], ginac_cv_rlversion=`cat 'conftest.out'`, ginac_cv_rlversion='unknown', ginac_cv_rlversion='4.2')
+    return 0;
+}], ginac_cv_rlversion=`cat 'conftest.out'`, ginac_cv_rlversion='unknown', ginac_cv_rlversion='4.2')])
 if test "x${ginac_cv_rlversion}" != "xunknown"; then
-  RL_VERSION_MAJOR=`echo ${ginac_cv_rlversion} | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\1/'`
+  RL_VERSION_MAJOR=`echo ${ginac_cv_rlversion} | sed -e 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
   AC_DEFINE_UNQUOTED(GINAC_RL_VERSION_MAJOR, $RL_VERSION_MAJOR, [Major version of installed readline library.])
-  RL_VERSION_MINOR=`echo ${ginac_cv_rlversion} | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\2/'`
+  RL_VERSION_MINOR=`echo ${ginac_cv_rlversion} | sed -e 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
   AC_DEFINE_UNQUOTED(GINAC_RL_VERSION_MINOR, $RL_VERSION_MINOR, [Minor version of installed readline library.])
 else
-  GINAC_WARNING([I could not run a test of libreadline (needed for building ginsh ginsh).])
+  GINAC_WARNING([I could not run a test of libreadline (needed for building ginsh).])
 fi
-])])
+])
 
 dnl Usage: GINAC_TERMCAP
 dnl libreadline is based on the termcap functions.
@@ -75,7 +74,7 @@ ginac_warning_txt="$ginac_warning_txt
 ginac_warning=yes])
 
 dnl Usage: GINAC_CHECK_ERRORS
-dnl (preferably to be put at end of configure.in)
+dnl (must be put at end of configure.in, because it exits on error)
 dnl This macro displays a warning message if GINAC_ERROR or GINAC_WARNING 
 dnl has occured previously.
 AC_DEFUN(GINAC_CHECK_ERRORS,[
@@ -87,14 +86,17 @@ if test "x${ginac_error}" = "xyes"; then
     if test "x${ginac_warning_txt}" != "x"; then
         echo "${ginac_warning_txt}"
     fi
-    echo "deleting cache ${cache_file}"
-    rm -f $cache_file
-    else 
-        if test x$ginac_warning = xyes; then
-            echo "=== The following minor problems have been detected by configure."
-            echo "=== Please check the messages below before running \"make\"."
-            echo "=== (see the section 'Common Problems' in the INSTALL file)"
-            echo "$ginac_warning_txt"
-        fi
+    if test "x$cache_file" != "x/dev/null"; then
+        echo "deleting cache ${cache_file}"
+        rm -f $cache_file
+    fi
+    exit 1
+else 
+    if test "x${ginac_warning}" = "xyes"; then
+        echo "=== The following minor problems have been detected by configure."
+        echo "=== Please check the messages below before running \"make\"."
+        echo "=== (see the section 'Common Problems' in the INSTALL file)"
+        echo "$ginac_warning_txt"
+    fi
     echo "Configuration of GiNaC $VERSION done. Now type \"make\"."
 fi])