[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 164804c4408b29a5c7b752eaad1b5a83fd9f2506
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Tue Apr 3 14:15:30 2012 +0200

    fix: configure test for readline, etc.

diff --git a/Singular/configure b/Singular/configure
index dc9a893..693cf00 100755
--- a/Singular/configure
+++ b/Singular/configure
@@ -2578,7 +2578,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_config_headers="$ac_config_headers mod2.h"
 
-ac_config_headers="$ac_config_headers ../kernel/mod2.h"
 
 
 
@@ -7798,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 readline in -lreadline" >&5
-$as_echo_n "checking for readline in -lreadline... " >&6; }
-if ${ac_cv_lib_readline_readline+:} false; then :
+   { $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_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7814,27 +7813,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char readline ();
+char completion_matches ();
 int
 main ()
 {
-return readline ();
+return completion_matches ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_readline_readline=yes
+  ac_cv_lib_readline_completion_matchese=yes
 else
-  ac_cv_lib_readline_readline=no
+  ac_cv_lib_readline_completion_matchese=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_readline" >&5
-$as_echo "$ac_cv_lib_readline_readline" >&6; }
-if test "x$ac_cv_lib_readline_readline" = xyes; then :
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBREADLINE 1
 _ACEOF
@@ -9788,7 +9787,6 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "mod2.h") CONFIG_HEADERS="$CONFIG_HEADERS mod2.h" ;;
-    "../kernel/mod2.h") CONFIG_HEADERS="$CONFIG_HEADERS ../kernel/mod2.h" ;;
     "${OUTPUT_MAKEFILES}") CONFIG_FILES="$CONFIG_FILES ${OUTPUT_MAKEFILES}" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
diff --git a/Singular/configure.in b/Singular/configure.in
index 7785d87..4b7b99a 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, readline)
+   AC_CHECK_LIB(readline, 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

-- 
an open source computer algebra system