ncurses 6.3 - patch 20211120

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index c2c3ca4ca509362169170e04aa1041738ff8c695..58940a746ccd25bb479ae7990831baf61b92eb51 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.992 2021/11/07 15:31:47 tom Exp $
+dnl $Id: aclocal.m4,v 1.997 2021/11/20 19:56:38 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -2072,7 +2072,7 @@ fi
 AC_SUBST(BROKEN_LINKER)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ENABLE_PC_FILES version: 15 updated: 2021/10/25 19:21:54
+dnl CF_ENABLE_PC_FILES version: 16 updated: 2021/11/20 12:48:37
 dnl ------------------
 dnl This is the "--enable-pc-files" option, which is available if there is a
 dnl pkg-config configuration on the local machine.
@@ -2101,7 +2101,8 @@ then
                AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found)
                ;;
        (*)
-               CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
+               cf_pkg_config_libdir="$PKG_CONFIG_LIBDIR"
+               CF_PATH_SYNTAX(cf_pkg_config_libdir)
                ;;
        esac
 else
@@ -9237,7 +9238,7 @@ if test "x$with_pcre2" != xno ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 17 updated: 2021/11/07 10:30:15
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 18 updated: 2021/11/20 12:48:37
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 dnl
@@ -9260,18 +9261,31 @@ case "$PKG_CONFIG" in
        ;;
 esac
 
+# if $PKG_CONFIG_LIBDIR is set, try to use that
 cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[         ]]*,,'`
+
+# if the option is used, let that override.  otherwise default to "libdir"
 AC_ARG_WITH(pkg-config-libdir,
        [  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
        [cf_search_path=$withval],
-       [test "x$PKG_CONFIG" != xnone && cf_search_path=yes])
+       [test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
 
 case x$cf_search_path in
+(xlibdir)
+       PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+       AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+       cf_search_path=
+       ;;
+(x)
+       ;;
 (x/*)
+       PKG_CONFIG_LIBDIR="$cf_search_path"
+       AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+       cf_search_path=
        ;;
-(xyes)
+(xyes|xauto)
+       AC_MSG_RESULT(auto)
        cf_search_path=
-       CF_VERBOSE(auto...)
        # Look for the library directory using the same prefix as the executable
        AC_MSG_CHECKING(for search-list)
        if test "x$PKG_CONFIG" != xnone
@@ -9300,54 +9314,57 @@ case x$cf_search_path in
        fi
 
        AC_MSG_RESULT($cf_search_path)
-
        ;;
 (*)
+       AC_MSG_ERROR(Unexpected option value: $cf_search_path)
        ;;
 esac
 
-AC_MSG_CHECKING(for first directory)
-cf_pkg_config_path=none
-for cf_config in $cf_search_path
-do
-       if test -d "$cf_config"
-       then
-               cf_pkg_config_path=$cf_config
-               break
-       fi
-done
-AC_MSG_RESULT($cf_pkg_config_path)
-
-if test "x$cf_pkg_config_path" != xnone ; then
-       # limit this to the first directory found
-       PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
-fi
-
-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+if test -n "$cf_search_path"
 then
-       AC_MSG_CHECKING(for workaround)
-       if test "$prefix" = "NONE" ; then
-               cf_prefix="$ac_default_prefix"
-       else
-               cf_prefix="$prefix"
-       fi
-       eval cf_libdir=$libdir
-       cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
-       cf_backup=
+       AC_MSG_CHECKING(for first directory)
+       cf_pkg_config_path=none
        for cf_config in $cf_search_path
        do
-               case $cf_config in
-               $cf_libdir/pkgconfig)
-                       PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
+               if test -d "$cf_config"
+               then
+                       cf_pkg_config_path=$cf_config
                        break
-                       ;;
-               *)
-                       test -z "$cf_backup" && cf_backup=$cf_config
-                       ;;
-               esac
+               fi
        done
-       test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-       AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+       AC_MSG_RESULT($cf_pkg_config_path)
+
+       if test "x$cf_pkg_config_path" != xnone ; then
+               # limit this to the first directory found
+               PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
+       fi
+
+       if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+       then
+               AC_MSG_CHECKING(for workaround)
+               if test "$prefix" = "NONE" ; then
+                       cf_prefix="$ac_default_prefix"
+               else
+                       cf_prefix="$prefix"
+               fi
+               eval cf_libdir=$libdir
+               cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
+               cf_backup=
+               for cf_config in $cf_search_path
+               do
+                       case $cf_config in
+                       $cf_libdir/pkgconfig)
+                               PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
+                               break
+                               ;;
+                       *)
+                               test -z "$cf_backup" && cf_backup=$cf_config
+                               ;;
+                       esac
+               done
+               test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+               AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+       fi
 fi
 
 AC_SUBST(PKG_CONFIG_LIBDIR)