ncurses 5.6 - patch 20070128

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 43be1cfb50c4226f7ad890ba64c957f2a2f8ea4e..a3ba0e111dc0b7200f269821f106903457e53cf9 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.415 2007/01/28 16:51:41 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1852,7 +1852,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 +1986,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 +4641,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 +4732,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)