ncurses 6.0 - patch 20150905

[ncurses.git] / Ada95 / aclocal.m4

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 4f5cd66c7dec7aadec66eb6fe896f505671f579e..49d733a612a9008b64bcb87ca623badd0deb070d 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright (c) 2010-2013,2014 Free Software Foundation, Inc.              *
+dnl Copyright (c) 2010-2014,2015 Free Software Foundation, Inc.              *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.104 2015/06/06 18:03:45 tom Exp $
+dnl $Id: aclocal.m4,v 1.106 2015/08/22 21:14:14 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1915,7 +1915,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 16 updated: 2015/04/15 19:08:48
+dnl CF_MAKEFLAGS version: 17 updated: 2015/08/05 20:44:28
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
@@ -1928,7 +1928,7 @@ AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
        for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
        do
                cat >cf_makeflags.tmp <<CF_EOF
-SHELL = /bin/sh
+SHELL = $SHELL
 all :
        @ echo '.$cf_option'
 CF_EOF
@@ -2205,7 +2205,7 @@ printf("old\n");
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 16 updated: 2015/06/06 14:00:48
+dnl CF_NCURSES_CONFIG version: 17 updated: 2015/07/07 04:22:07
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
@@ -2219,7 +2219,7 @@ AC_REQUIRE([CF_PKG_CONFIG])
 cf_ncuconfig_root=ifelse($1,,ncurses,$1)
 cf_have_ncuconfig=no
 
-if test "x$PKG_CONFIG" != xnone; then
+if test "x${PKG_CONFIG:=none}" != xnone; then
        AC_MSG_CHECKING(pkg-config for $cf_ncuconfig_root)
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
                AC_MSG_RESULT(yes)
@@ -2921,7 +2921,7 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 87 updated: 2015/04/17 21:13:04
+dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -2974,11 +2974,12 @@ AC_DEFUN([CF_SHARED_OPTS],
        (yes)
                cf_cv_shlib_version=auto
                ;;
-       (rel|abi|auto|no)
+       (rel|abi|auto)
                cf_cv_shlib_version=$withval
                ;;
        (*)
-               AC_MSG_ERROR([option value must be one of: rel, abi, auto or no])
+               AC_MSG_RESULT($withval)
+               AC_MSG_ERROR([option value must be one of: rel, abi, or auto])
                ;;
        esac
        ],[cf_cv_shlib_version=auto])
@@ -3020,14 +3021,14 @@ AC_DEFUN([CF_SHARED_OPTS],
                ;;
        (cygwin*)
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+               MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
                RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
                cf_cv_shlib_version=cygdll
                cf_cv_shlib_version_infix=cygdll
                shlibdir=$bindir
                MAKE_DLLS=
                cat >mk_shared_lib.sh <<-CF_EOF
-               #!/bin/sh
+               #!$SHELL
                SHARED_LIB=\[$]1
                IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
                shift
@@ -3042,14 +3043,14 @@ CF_EOF
                ;;
        (msys*)
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+               MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
                RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
                cf_cv_shlib_version=msysdll
                cf_cv_shlib_version_infix=msysdll
                shlibdir=$bindir
                MAKE_DLLS=
                cat >mk_shared_lib.sh <<-CF_EOF
-               #!/bin/sh
+               #!$SHELL
                SHARED_LIB=\[$]1
                IMPORT_LIB=\`echo "\[$]1" | sed -e 's/msys-/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
                shift
@@ -3143,10 +3144,10 @@ CF_EOF
                        EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS"
                fi
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+               MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
                RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
                cat >mk_shared_lib.sh <<-CF_EOF
-               #!/bin/sh
+               #!$SHELL
                SHARED_LIB=\[$]1
                IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
                shift
@@ -3701,19 +3702,25 @@ eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 8 updated: 2015/06/06 13:49:58
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 10 updated: 2015/08/22 17:10:56
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
-AC_MSG_CHECKING(for $PKG_CONFIG library directory)
-if test "x$PKG_CONFIG" = xnone ; then
-       PKG_CONFIG_LIBDIR=no
-else
-       AC_ARG_WITH(pkg-config-libdir,
-               [  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
-               [PKG_CONFIG_LIBDIR=$withval],
-               [PKG_CONFIG_LIBDIR=yes])
-fi
+
+case $PKG_CONFIG in
+(no|none|yes)
+       AC_MSG_CHECKING(for pkg-config library directory)
+       ;;
+(*)
+       AC_MSG_CHECKING(for $PKG_CONFIG library directory)
+       ;;
+esac
+
+PKG_CONFIG_LIBDIR=no
+AC_ARG_WITH(pkg-config-libdir,
+       [  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
+       [PKG_CONFIG_LIBDIR=$withval],
+       [test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes])
 
 case x$PKG_CONFIG_LIBDIR in
 (x/*)
@@ -3769,7 +3776,7 @@ case x$PKG_CONFIG_LIBDIR in
        ;;
 esac
 
-if test "x$PKG_CONFIG" != xnone ; then
+if test "x$PKG_CONFIG_LIBDIR" != xno ; then
        AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
 fi