From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 10 Jun 2014 13:54:53 +0000 (+0000)
Subject: Use AC_PATH_TOOL for the *-config scripts we call (STR #4423)
X-Git-Tag: v2.2b1~617
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cffefbacf13471398b86bf18ede5a59cb675656a;p=thirdparty%2Fcups.git

Use AC_PATH_TOOL for the *-config scripts we call (STR #4423)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11911 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index de7517df49..22a6330076 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.0b1 - 2014-05-21
+CHANGES.txt - 2.0b1 - 2014-06-10
 --------------------------------
 
 CHANGES IN CUPS V2.0b1
@@ -11,6 +11,8 @@ CHANGES IN CUPS V2.0b1
 	- Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX)
 	- Dropped lppasswd and support for Digest authentication in in the
 	  scheduler (STR #4321)
+	- The configure script now supports target-specific tools for pkg-config
+	  and others (STR #4423)
 	- The ipptool program now supports EXPECT statements for collection
 	  member attributes (<rdar://problem/15355218>)
 	- The ipptool program now supports collection attributes with multiple
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 6318b77f70..708f613dd2 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -89,7 +89,7 @@ fi
 AC_SUBST(INSTALLSTATIC)
 
 dnl Check for pkg-config, which is used for some other tests later on...
-AC_PATH_PROG(PKGCONFIG, pkg-config)
+AC_PATH_TOOL(PKGCONFIG, pkg-config)
 
 dnl Check for libraries...
 AC_SEARCH_LIBS(abs, m, AC_DEFINE(HAVE_ABS))
diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4
index 690d36c7cf..531308d869 100644
--- a/config-scripts/cups-gssapi.m4
+++ b/config-scripts/cups-gssapi.m4
@@ -22,7 +22,7 @@ LIBGSSAPI=""
 AC_SUBST(LIBGSSAPI)
 
 if test x$enable_gssapi != xno; then
-	AC_PATH_PROG(KRB5CONFIG, krb5-config)
+	AC_PATH_TOOL(KRB5CONFIG, krb5-config)
 	if test "x$KRB5CONFIG" != x; then
 		case "$uname" in
 			Darwin)
diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index d20daf9827..444d7c3643 100644
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -59,8 +59,8 @@ if test x$enable_ssl != xno; then
 
     dnl Then look for GNU TLS...
     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
-    	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
-    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
+    	AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
+    	AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
 	if $PKGCONFIG --exists gnutls; then
 	    have_ssl=1
 	    SSLLIBS=`$PKGCONFIG --libs gnutls`