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 de7517df49637a162976fd5207274ebf56c872e8..22a63300766c36b417b64a57b73a7317e563a3f4 100644 (file)
--- 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 6318b77f70c981e66eee98bc6314cf40e39b0360..708f613dd2487bf2f3873fd384950d42f96be232 100644 (file)
--- 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 690d36c7cfd1505afe89c69d14759f383b56930a..531308d869245d654c13c7fabe818bb65037eac1 100644 (file)
--- 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 d20daf9827dc38407a21da392a31e9ca84a4bd70..444d7c36431223362098649b1a0f2e663fc9ca28 100644 (file)
--- 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`