ncurses 5.9 - patch 20120825

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index adcfb672e10668b4d49bef14d66170fe10f394d9..7fc85227f4aa8ed53abeae02eec6a7ea7d99bd4e 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.614 2012/06/16 18:59:48 tom Exp $
+dnl $Id: aclocal.m4,v 1.621 2012/08/11 23:36:44 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1332,7 +1332,7 @@ if test "$cf_disable_rpath_hack" = no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_ENABLE_PC_FILES version: 7 updated: 2011/12/10 18:58:47
+dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
 dnl ------------------
 dnl This is the "--enable-pc-files" option, which is available if there is a
 dnl pkg-config configuration on the local machine.
@@ -1341,16 +1341,15 @@ AC_REQUIRE([CF_PKG_CONFIG])
 AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
 
 if test "$PKG_CONFIG" != none ; then
-       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-               AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
-               AC_ARG_ENABLE(pc-files,
-                       [  --enable-pc-files       generate and install .pc files for pkg-config],
-                       [enable_pc_files=$enableval],
-                       [enable_pc_files=no])
-               AC_MSG_RESULT($enable_pc_files)
-       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-               enable_pc_files=no
-               AC_MSG_WARN(did not find $PKG_CONFIG library)
+       AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
+       AC_ARG_ENABLE(pc-files,
+               [  --enable-pc-files       generate and install .pc files for pkg-config],
+               [enable_pc_files=$enableval],
+               [enable_pc_files=no])
+       AC_MSG_RESULT($enable_pc_files)
+       if test "$enable_pc_files" != no
+       then
+               CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
        fi
 else
        enable_pc_files=no
@@ -3131,7 +3130,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 64 updated: 2012/02/25 15:20:07
+dnl CF_LIB_RULES version: 65 updated: 2012/06/30 17:25:25
 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
@@ -3295,7 +3294,7 @@ do
                mv $cf_dir/Makefile.out $cf_dir/Makefile
 
                $AWK -f $srcdir/mk-0th.awk \
-                       libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \
+                       libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \
                        $srcdir/$cf_dir/modules >>$cf_dir/Makefile
 
                for cf_subset in $cf_subsets
@@ -4167,7 +4166,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 40 updated: 2011/09/10 16:20:21
+dnl CF_MAN_PAGES version: 41 updated: 2012/08/11 19:35:44
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -4224,6 +4223,7 @@ cat >$cf_edit_man <<CF_EOF
 # this script is generated by the configure-script CF_MAN_PAGES macro.
 
 prefix="$cf_prefix"
+datarootdir="$datarootdir"
 datadir="$datadir"
 
 NCURSES_MAJOR="$NCURSES_MAJOR"
@@ -4718,7 +4718,7 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR])
        AC_SUBST(PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
+dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -4738,7 +4738,7 @@ case ".[$]$1" in #(vi
   ;;
 .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
   ;;
-.\[$]{*prefix}*) #(vi
+.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
   eval $1="[$]$1"
   case ".[$]$1" in #(vi
   .NONE/*)