ncurses 5.6 - patch 20070210

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 43be1cfb50c4226f7ad890ba64c957f2a2f8ea4e..555f773938b00a7b38f823af60279fc0bf8edf54 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.413 2007/01/13 19:46:41 tom Exp $
+dnl $Id: aclocal.m4,v 1.416 2007/02/03 16:35:13 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -703,84 +703,6 @@ fi
 test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CPP_VSCAN_FUNC version: 5 updated: 2001/12/02 01:39:28
-dnl -----------------
-dnl Check if the g++ compiler supports vscan function (not a standard feature).
-AC_DEFUN([CF_CPP_VSCAN_FUNC],
-[
-if test -n "$CXX"; then
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_CHECK_HEADERS(strstream.h)
-
-AC_CACHE_CHECK(if $CXX supports vscan function,cf_cv_cpp_vscan_func,[
-       for cf_vscan_func in strstream strstream_cast stdio
-       do
-       case $cf_vscan_func in #(vi
-       stdio)          cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi
-       strstream)      cf_vscan_defs=USE_STRSTREAM_VSCAN ;;
-       strstream_cast) cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
-       esac
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <stdarg.h>
-#define $cf_vscan_defs 1
-#if defined(USE_STDIO_VSCAN)
-#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN)
-#include <strstream.h>
-#endif
-
-int scanw(const char* fmt, ...)
-{
-    int result = -1;
-    char buf[BUFSIZ];
-
-    va_list args;
-    va_start(args, fmt);
-#if defined(USE_STDIO_VSCAN)
-    if (::vsscanf(buf, fmt, args) != -1)
-       result = 0;
-#elif defined(USE_STRSTREAM_VSCAN)
-    strstreambuf ss(buf, sizeof(buf));
-    if (ss.vscan(fmt, args) != -1)
-       result = 0;
-#elif defined(USE_STRSTREAM_VSCAN_CAST)
-    strstreambuf ss(buf, sizeof(buf));
-    if (ss.vscan(fmt, (_IO_va_list)args) != -1)
-       result = 0;
-#else
-#error case $cf_vscan_func failed
-#endif
-    va_end(args);
-    return result;
-}
-],[int tmp, foo = scanw("%d", &tmp)],
-       [cf_cv_cpp_vscan_func=$cf_vscan_func; break],
-       [cf_cv_cpp_vscan_func=no])
-       test "$cf_cv_cpp_vscan_func" != no && break
-       done
-])
-
-AC_LANG_RESTORE
-fi
-
-case $cf_cv_cpp_vscan_func in #(vi
-stdio) #(vi
-       AC_DEFINE(CPP_HAS_VSCAN_FUNC)
-       AC_DEFINE(USE_STDIO_VSCAN)
-       ;;
-strstream)
-       AC_DEFINE(CPP_HAS_VSCAN_FUNC)
-       AC_DEFINE(USE_STRSTREAM_VSCAN)
-       ;;
-strstream_cast)
-       AC_DEFINE(CPP_HAS_VSCAN_FUNC)
-       AC_DEFINE(USE_STRSTREAM_VSCAN_CAST)
-       ;;
-esac
-])dnl
-dnl ---------------------------------------------------------------------------
 dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
@@ -1852,7 +1774,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 43 updated: 2007/01/13 14:44:50
+dnl CF_LIB_RULES version: 44 updated: 2007/01/28 11:40:44
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -1986,7 +1908,7 @@ do
                                case $cf_subset in
                                *base*)
                                        ;;
-                               termlib*)
+                               *termlib*)
                                        cf_libname=$TINFO_LIB_SUFFIX
                                        if test -n "${DFT_ARG_SUFFIX}" ; then
                                                # undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
@@ -4641,7 +4563,7 @@ if test "$with_gpm" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL version: 12 updated: 2006/12/30 19:00:13
+dnl CF_WITH_LIBTOOL version: 13 updated: 2007/01/27 17:52:16
 dnl ---------------
 dnl Provide a configure option to incorporate libtool.  Define several useful
 dnl symbols for the makefile rules.
@@ -4732,7 +4654,7 @@ ifdef([AC_PROG_LIBTOOL],[
        # Save the version in a cache variable - this is not entirely a good
        # thing, but the version string from libtool is very ugly, and for
        # bug reports it might be useful to have the original string.
-       cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
+       cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
        AC_MSG_RESULT($cf_cv_libtool_version)
        if test -z "$cf_cv_libtool_version" ; then
                AC_MSG_ERROR(This is not libtool)