[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 1edd0c645c4e50b6793b458dcad8bc50a97b2bfa
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Wed Apr 11 13:36:33 2012 +0200

    fix: readline detection: usr rl_completion_matches

diff --git a/Singular/configure b/Singular/configure
index f43f6b8..a829a5a 100755
--- a/Singular/configure
+++ b/Singular/configure
@@ -7797,9 +7797,9 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for completion_matches in -lreadline" >&5
-$as_echo_n "checking for completion_matches in -lreadline... " >&6; }
-if ${ac_cv_lib_readline_completion_matches+:} false; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
+$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7813,27 +7813,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char completion_matches ();
+char rl_completion_matches ();
 int
 main ()
 {
-return completion_matches ();
+return rl_completion_matches ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_readline_completion_matches=yes
+  ac_cv_lib_readline_rl_completion_matches=yes
 else
-  ac_cv_lib_readline_completion_matches=no
+  ac_cv_lib_readline_rl_completion_matches=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_completion_matches" >&5
-$as_echo "$ac_cv_lib_readline_completion_matches" >&6; }
-if test "x$ac_cv_lib_readline_completion_matches" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBREADLINE 1
 _ACEOF
@@ -8088,7 +8088,7 @@ $as_echo "$ac_cv_have_readline" >&6; }
       ac_cv_have_readline="yes"
     fi
   fi
-  if test "$ac_cv_lib_readline_completion_matches" = yes; then
+  if test "$ac_cv_lib_readline_rl_completion_matches" = yes; then
     $as_echo "#define HAVE_READLINE 1" >>confdefs.h
 
   fi
@@ -8107,7 +8107,7 @@ 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_lib_readline_completion_matches" = yes; then
+elif test "$ac_cv_lib_readline_rl_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
diff --git a/Singular/configure.in b/Singular/configure.in
index 19c263d..f397b48 100644
--- a/Singular/configure.in
+++ b/Singular/configure.in
@@ -1017,7 +1017,7 @@ fi
 if test "$with_readline" != dynamic && test "$with_readline" != no; then
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-   AC_CHECK_LIB(readline, completion_matches)
+   AC_CHECK_LIB(readline, rl_completion_matches)
    AC_CHECK_HEADERS(readline/readline.h readline/history.h)
    if test "$ac_cv_lib_readline_readline" = yes && \
       test "$ac_cv_header_readline_readline_h" = yes; then
@@ -1080,7 +1080,7 @@ ac_cv_have_readline="no"
       ac_cv_have_readline="yes"
     fi
   fi
-  if test "$ac_cv_lib_readline_completion_matches" = yes; then
+  if test "$ac_cv_lib_readline_rl_completion_matches" = yes; then
     AC_DEFINE(HAVE_READLINE)
   fi
 AC_LANG_RESTORE
@@ -1090,7 +1090,7 @@ 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_lib_readline_completion_matches" = yes; then
+elif test "$ac_cv_lib_readline_rl_completion_matches" = yes; then
   AC_MSG_RESULT(static)
   AC_DEFINE(HAVE_READLINE)
 elif test "$ac_cv_singuname" = PowerMacintosh-darwin; then

-- 
an open source computer algebra system