X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=aclocal.m4;h=fe627fdbb27983075d709448bd603ba23ce74306;hp=d4cb399bc994e67795632a123d95c1655fd985e4;hb=af922d5eb36ed70e4a9e3ffaf4c24492cf89a1a6;hpb=ff50f412bb89eed2c78adffa0f390341753e8792 diff --git a/aclocal.m4 b/aclocal.m4 index d4cb399b..fe627fdb 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 ], + AC_TRY_LINK([#include ], [doublefactorial(2);], ginac_cv_lib_cln_link="-lcln", ginac_cv_lib_cln_link="fail") ;; *) - AC_TRY_LINK([#include ], + AC_TRY_LINK([#include ], [doublefactorial(2);], ginac_cv_lib_cln_link="-lcln", ginac_cv_lib_cln_link="fail") @@ -66,12 +66,32 @@ dnl linking failed: "fail") LIBS="${saved_LIBS}" AC_MSG_RESULT([no]) - GINAC_ERROR([I could not successfully link a test-program against libcln and run it. + GINAC_ERROR([I could not successfully link a test-program against libcln. You either need to set \$LDFLAGS or install/update the CLN library.]) ;; 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. @@ -277,7 +297,7 @@ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || AC_MSG_ERROR([libtool configure failed]) # Reload cache, that may have been modified by ltconfig @@ -309,11 +329,6 @@ AC_REQUIRE([AC_PROG_NM])dnl AC_REQUIRE([AC_PROG_LN_S])dnl dnl -case "$target" in -NONE) lt_target="$host" ;; -*) lt_target="$target" ;; -esac - # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" @@ -332,7 +347,7 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" # Some flags need to be propagated to the compiler or linker for good # libtool support. -case "$lt_target" in +case "$host" in *-*-irix6*) # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext @@ -357,7 +372,10 @@ case "$lt_target" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])]) + [AC_LANG_SAVE + AC_LANG_C + AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_RESTORE]) if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -548,6 +566,7 @@ else AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_SUBST(LD) AC_PROG_LD_GNU ]) @@ -593,13 +612,14 @@ else fi]) NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) +AC_SUBST(NM) ]) # AC_CHECK_LIBM - check for math library AC_DEFUN(AC_CHECK_LIBM, [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= -case "$lt_target" in +case "$host" in *-*-beos* | *-*-cygwin*) # These system don't have libm ;;