diff options
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 08a06d85..6cc3e773 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $LynxId: aclocal.m4,v 1.223 2015/04/25 00:52:45 tom Exp $ +dnl $LynxId: aclocal.m4,v 1.225 2015/04/27 00:38:54 tom Exp $ dnl Macros for auto-configure script. dnl by Thomas E. Dickey <dickey@invisible-island.net> dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> @@ -3718,11 +3718,13 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 11 updated: 2015/04/23 20:35:30 +dnl CF_NCURSES_CONFIG version: 13 updated: 2015/04/26 18:06:58 dnl ----------------- -dnl Tie together the configure-script macros for ncurses. -dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. -dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable. +dnl Tie together the configure-script macros for ncurses, preferring these in +dnl order: +dnl a) ".pc" files for pkg-config, using $NCURSES_CONFIG_PKG +dnl b) the "-config" script from ncurses, using $NCURSES_CONFIG +dnl c) just plain libraries dnl dnl $1 is the root library name (default: "ncurses") AC_DEFUN([CF_NCURSES_CONFIG],[ @@ -3758,13 +3760,18 @@ if test "x$PKG_CONFIG" != xnone; then then CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" + NCURSES_CONFIG_PKG=none else AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + NCURSES_CONFIG_PKG=$cf_ncuconfig_root fi else AC_MSG_RESULT(no) + NCURSES_CONFIG_PKG=none fi +else + NCURSES_CONFIG_PKG=none fi if test "x$cf_have_ncuconfig" = "xno"; then @@ -3798,6 +3805,8 @@ if test "x$cf_have_ncuconfig" = "xno"; then CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) fi +else + NCURSES_CONFIG=none fi ])dnl dnl --------------------------------------------------------------------------- @@ -4494,7 +4503,7 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PKG_CONFIG version: 9 updated: 2015/04/12 15:39:00 +dnl CF_PKG_CONFIG version: 10 updated: 2015/04/26 18:06:58 dnl ------------- dnl Check for the package-config program, unless disabled by command-line. AC_DEFUN([CF_PKG_CONFIG], @@ -4523,7 +4532,7 @@ esac test -z "$PKG_CONFIG" && PKG_CONFIG=none if test "$PKG_CONFIG" != none ; then CF_PATH_SYNTAX(PKG_CONFIG) -else +elif test "x$cf_pkg_config" != xno ; then AC_MSG_WARN(pkg-config is not installed) fi |