- (l)degree(s), coeff(s, n) and collect(s) were extended to accept expressions

[ginac.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index e52e450145800c87d11aff0e5d97a2e7a5e38a0b..4b5cd720e89100ffcafb3b9442ab4ab7a3168563 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -24,16 +24,16 @@ main()
     fprintf(fd, "%s\n", rl_library_version);
     fclose(fd);
     return 0;
     fprintf(fd, "%s\n", rl_library_version);
     fclose(fd);
     return 0;

-}], ginac_cv_rlversion=`cat 'conftest.out'`, ginac_cv_rlversion='unknown', ginac_cv_rlversion='4.2')
+}], ginac_cv_rlversion=`cat 'conftest.out'`, ginac_cv_rlversion='unknown', ginac_cv_rlversion='4.2')])

 if test "x${ginac_cv_rlversion}" != "xunknown"; then
 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.])
   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
   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
 fi

-])])
+])

 
 dnl Usage: GINAC_TERMCAP
 dnl libreadline is based on the termcap functions.
 
 dnl Usage: GINAC_TERMCAP
 dnl libreadline is based on the termcap functions.


@@ -86,8 +86,10 @@ if test "x${ginac_error}" = "xyes"; then
     if test "x${ginac_warning_txt}" != "x"; then
         echo "${ginac_warning_txt}"
     fi
     if test "x${ginac_warning_txt}" != "x"; then
         echo "${ginac_warning_txt}"
     fi

-    echo "deleting cache ${cache_file}"
-    rm -f $cache_file
+    if test "x$cache_file" != "x/dev/null"; then
+        echo "deleting cache ${cache_file}"
+        rm -f $cache_file
+    fi

     else 
         if test x$ginac_warning = xyes; then
             echo "=== The following minor problems have been detected by configure."
     else 
         if test x$ginac_warning = xyes; then
             echo "=== The following minor problems have been detected by configure."