[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit d02b322a7f4ccc7384b0274f182a37f4a8a68946
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Tue Apr 3 15:40:52 2012 +0200

    fix: readline test

diff --git a/Singular/configure b/Singular/configure
index 3628ee2..f43f6b8 100755
--- a/Singular/configure
+++ b/Singular/configure
@@ -8088,7 +8088,7 @@ $as_echo "$ac_cv_have_readline" >&6; }
       ac_cv_have_readline="yes"
     fi
   fi
-  if test "$ac_cv_have_readline" = yes; then
+  if test "$ac_cv_lib_readline_completion_matches" = yes; then
     $as_echo "#define HAVE_READLINE 1" >>confdefs.h
 
   fi
@@ -8107,9 +8107,10 @@ if test "$ac_cv_with_readline" = dynamic; then
 $as_echo "dynamic" >&6; }
   $as_echo "#define HAVE_DYN_RL 1" >>confdefs.h
 
-elif test "$ac_cv_have_readline" = yes; then
+elif test "$ac_cv_lib_readline_completion_matches" = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
 $as_echo "static" >&6; }
+  $as_echo "#define HAVE_READLINE 1" >>confdefs.h
 elif test "$ac_cv_singuname" = PowerMacintosh-darwin; then
   as_fn_error $? "building without readline impossible on PowerMacintosh-darwin" "$LINENO" 5
 else
diff --git a/Singular/configure.in b/Singular/configure.in
index 4b7b99a..19c263d 100644
--- a/Singular/configure.in
+++ b/Singular/configure.in
@@ -1080,7 +1080,7 @@ ac_cv_have_readline="no"
       ac_cv_have_readline="yes"
     fi
   fi
-  if test "$ac_cv_have_readline" = yes; then
+  if test "$ac_cv_lib_readline_completion_matches" = yes; then
     AC_DEFINE(HAVE_READLINE)
   fi
 AC_LANG_RESTORE
@@ -1090,8 +1090,9 @@ AC_MSG_CHECKING(which readline to use)
 if test "$ac_cv_with_readline" = dynamic; then
   AC_MSG_RESULT(dynamic)
   AC_DEFINE(HAVE_DYN_RL)
-elif test "$ac_cv_have_readline" = yes; then
+elif test "$ac_cv_lib_readline_completion_matches" = yes; then
   AC_MSG_RESULT(static)
+  AC_DEFINE(HAVE_READLINE)
 elif test "$ac_cv_singuname" = PowerMacintosh-darwin; then
   AC_MSG_ERROR(building without readline impossible on PowerMacintosh-darwin)
 else

-- 
an open source computer algebra system