ncurses 5.9 - patch 20130816

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 318e757de0abb275c6e46b54ab76d7079c2c1df5..ca69d91937c47533a424deebe0381894f4670659 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.673 2013/07/27 22:15:13 tom Exp $
+dnl $Id: aclocal.m4,v 1.675 2013/08/17 18:43:56 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3110,7 +3110,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 72 updated: 2013/03/24 17:10:41
+dnl CF_LIB_RULES version: 73 updated: 2013/08/03 18:18:08
 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
@@ -3482,12 +3482,14 @@ CF_EOF
 fi
 done
 
+if test "x$cf_with_db_install" = xyes; then
 cat >> Makefile <<CF_EOF
 
 install.libs uninstall.libs \\
 install.data uninstall.data ::
 $MAKE_TERMINFO cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@
 CF_EOF
+fi
 
 if test "x$cf_with_manpages" = xyes; then
 cat >> Makefile <<CF_EOF
@@ -5338,7 +5340,7 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 79 updated: 2013/07/27 17:57:16
+dnl CF_SHARED_OPTS version: 81 updated: 2013/08/03 18:18:08
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -5916,7 +5918,7 @@ if test "$cf_cv_sizechange" != no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SRC_MODULES version: 26 updated: 2012/01/07 15:08:24
+dnl CF_SRC_MODULES version: 27 updated: 2013/08/03 18:18:08
 dnl --------------
 dnl For each parameter, test if the source-directory exists, and if it contains
 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
@@ -6005,7 +6007,9 @@ done
 if test "x$cf_with_tests" != "xno" ; then
        SRC_SUBDIRS="$SRC_SUBDIRS test"
 fi
-test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
+if test "x$cf_with_db_install" = xyes; then
+       test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
+fi
 if test "$cf_with_cxx_binding" != no; then
        PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}"
        SRC_SUBDIRS="$SRC_SUBDIRS c++"