X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=aclocal.m4;h=099e24f86e965ddc661d1f239538ed8f722be7c0;hp=d4cb399bc994e67795632a123d95c1655fd985e4;hb=857ca8ca24fbfe26d4c0c624aa6c3f2296c419f8;hpb=ff50f412bb89eed2c78adffa0f390341753e8792

diff --git a/aclocal.m4 b/aclocal.m4
index d4cb399b..099e24f8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -43,13 +43,13 @@ AC_DEFUN(GINAC_CHECK_LIBCLN,
         [LIBS="-lcln"
         case "${ac_cv_header_cln_cln_h}" in
         "yes")
-            AC_TRY_LINK([#include <cln/cln.h>],
+            AC_TRY_LINK([#include <cln/cl_integer.h>],
                 [doublefactorial(2);],
                 ginac_cv_lib_cln_link="-lcln",
                 ginac_cv_lib_cln_link="fail")
             ;;
         *)
-            AC_TRY_LINK([#include <cln.h>],
+            AC_TRY_LINK([#include <cl_integer.h>],
                 [doublefactorial(2);],
                 ginac_cv_lib_cln_link="-lcln",
                 ginac_cv_lib_cln_link="fail")
@@ -72,6 +72,26 @@ dnl linking failed:
     esac
 ])
 
+dnl Usage: GINAC_TERMCAP
+dnl libreadline is based on the termcap functions.
+dnl Some systems have tgetent(), tgetnum(), tgetstr(), tgetflag(), tputs(),
+dnl tgoto() in libc, some have it in libtermcap, some have it in libncurses.
+dnl When both libtermcap and libncurses exist, we prefer the latter, because
+dnl libtermcap is being phased out.
+AC_DEFUN(GINAC_TERMCAP,
+[LIBTERMCAP=
+AC_CHECK_FUNCS(tgetent)
+if test "x$ac_cv_func_tgetent" = "xyes"; then
+    :
+else
+    AC_CHECK_LIB(ncurses, tgetent, LIBTERMCAP="-lncurses")
+    if test -z "$LIBTERMCAP"; then
+        AC_CHECK_LIB(termcap, tgetent, LIBTERMCAP="-ltermcap")
+    fi
+fi
+AC_SUBST(LIBTERMCAP)
+])
+
 dnl Usage: GINAC_ERROR(message)
 dnl This macro displays the warning "message" and sets the flag ginac_error
 dnl to yes.
@@ -96,23 +116,23 @@ dnl This macro displays a warning message if GINAC_ERROR or GINAC_WARNING
 dnl has occured previously.
 AC_DEFUN(GINAC_CHECK_ERRORS,[
 if test "x${ginac_error}" = "xyes"; then
-  echo "**** The following 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_error_txt"
-  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"
+    echo "**** The following 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_error_txt"
+    if test "x${ginac_warning_txt}" != "x"; then
+        echo "${ginac_warning_txt}"
     fi
-  echo "Configuration of GiNaC $VERSION done. Now type \"make\"."
+    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
+    echo "Configuration of GiNaC $VERSION done. Now type \"make\"."
 fi])
 
 # Like AC_CONFIG_HEADER, but automatically create stamp file.