X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=acinclude.m4;h=9645620e1a56e0565eccb5b60801823dae8dab61;hp=45ea8dae4661662cbf5709a4b82a96b881c3223d;hb=0f26d08929532724d24a60e9fa5e5e98c4b2fa55;hpb=28a3fbcae30217a4574ec5cd64a89c8757a54cbf

diff --git a/acinclude.m4 b/acinclude.m4
index 45ea8dae..9645620e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,37 +4,46 @@ dnl additions' names with AC_ but with GINAC_ in order to steer clear of
 dnl future trouble.
 dnl ===========================================================================
 
-dnl Usage: GINAC_RLVERSION
-dnl The maintainers of libreadline are complete morons: they don't care a shit
-dnl about compatiblilty (which is not so bad by itself) and at the same time 
-dnl they don't export the version to the preprocessor so we could kluge around 
-dnl incomatiblities.  The only reliable way to figure out the version is by 
-dnl checking the extern variable rl_library_version at runtime.  &#@$%*!
-AC_DEFUN([GINAC_LIB_READLINE_VERSION],
-[AC_CACHE_CHECK([for version of libreadline], ginac_cv_rlversion, [
-AC_TRY_RUN([
-#include <stdio.h>
-#include <sys/types.h>
-#include <readline/readline.h>
-
-int main()
-{
-    FILE *fd;
-    fd = fopen("conftest.out", "w");
-    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')])
-if test "x${ginac_cv_rlversion}" != "xunknown"; then
-  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.])
-  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.])
+dnl Usage: GINAC_LIBREADLINE
+dnl
+dnl Check if GNU readline library and headers are avialable.
+dnl Defines GINSH_LIBS variable, and HAVE_LIBREADLINE,
+dnl HAVE_READLINE_READLINE_H, HAVE_READLINE_HISTORY_H preprocessor macros.
+dnl
+dnl Note: this macro rejects readline versions <= 4.2 and non-GNU
+dnl implementations.
+dnl
+AC_DEFUN([GINAC_READLINE],[
+AC_REQUIRE([GINAC_TERMCAP])
+GINSH_LIBS=""
+AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+if test "x${ac_cv_header_readline_readline_h}" != "xyes" -o "x${ac_cv_header_readline_history_h}" != "xyes"; then
+	GINAC_WARNING([readline headers could not be found.])
 else
-  GINAC_WARNING([I could not run a test of libreadline (needed for building ginsh).])
+	AC_CACHE_CHECK([for version of libreadline], [ginac_cv_rl_supported], [
+		ginac_cv_rl_supported="no"
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+			#include <stdio.h>
+			#include <readline/readline.h>
+			#if !defined(RL_VERSION_MAJOR) || !defined(RL_VERSION_MINOR)
+			#error "Ancient/unsupported version of readline"
+			#endif]])],
+			[ginac_cv_rl_supported="yes"])])
+	if test "x${ginac_cv_rl_supported}" != "xyes"; then
+		GINAC_WARNING([Unsupported version of readline (<= 4.2 or non-GNU).])
+	else
+		save_LIBS="$LIBS"
+		LIBS="$LIBTERMCAP $LIBS"
+		AC_CHECK_LIB(readline, readline)
+		if test "x${ac_cv_lib_readline_readline}" != "xyes"; then
+			GINAC_WARNING([libreadline could not be found.])
+		fi
+		GINSH_LIBS="$LIBS"
+		LIBS="$save_LIBS"
+	fi
 fi
-])
-
+AC_SUBST(GINSH_LIBS)])
+	
 dnl Usage: GINAC_TERMCAP
 dnl libreadline is based on the termcap functions.
 dnl Some systems have tgetent(), tgetnum(), tgetstr(), tgetflag(), tputs(),