X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Faclocal.m4;h=3574adb3e4917fb033dbd1084d1b0e324fc51e58;hp=022776545aced3b956746df9f75f96f2876aa834;hb=8f4cd91a25f1569f73651062aaaf5fb969182eab;hpb=f399f54c6c4ea2143afcbf704ce9af0be52b63fc

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 02277654..3574adb3 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.188 2021/10/30 20:49:04 tom Exp $
+dnl $Id: aclocal.m4,v 1.189 2021/11/07 15:35:59 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -4802,7 +4802,7 @@ eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 16 updated: 2021/10/26 16:50:11
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 17 updated: 2021/11/07 10:30:15
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 dnl
@@ -4842,12 +4842,15 @@ case x$cf_search_path in
 	if test "x$PKG_CONFIG" != xnone
 	then
 		# works for pkg-config since version 0.24 (2009)
-		cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'`
-		cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
-
 		# works for pkgconf since version 0.8.3 (2012)
-		test -z "$cf_search_path" && \
-		cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '`
+		for cf_pkg_program in \
+			`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \
+			pkg-config \
+			pkgconf
+		do
+			cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
+			test -n "$cf_search_path" && break
+		done
 
 		# works for pkg-config since import in 2005 of original 2001 HP code.
 		test -z "$cf_search_path" && \