aboutsummaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2015-05-16 05:08:53 -0400
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-05-28 15:24:58 +0000
commit222de83d95993baf9f1d64138f8f040929b935d8 (patch)
tree679ec4733e9528dfaa195b307cfcbd62a1615b7e /acinclude.m4
parentabfd44571ca7d58da6b77ae45d72ecf58c8c2bd5 (diff)
switch to AC_PATH_TOOL
The TOOL variant will automatically search for host prefixed scripts (e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back to the default (i.e. pcap-config). This makes cross-compiling a bit simpler. Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c Reviewed-on: https://code.wireshark.org/review/8481 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index ffb1cac30b..c79c42741f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -380,7 +380,7 @@ AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
# The user didn't specify a directory in which libpcap resides.
# First, look for a pcap-config script.
#
- AC_PATH_PROG(PCAP_CONFIG, pcap-config)
+ AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
if test -n "$PCAP_CONFIG" ; then
#
@@ -1217,7 +1217,7 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
fi
else
- AC_PATH_PROG(KRB5_CONFIG, krb5-config)
+ AC_PATH_TOOL(KRB5_CONFIG, krb5-config)
if test -x "$KRB5_CONFIG"
then
KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
@@ -2033,7 +2033,7 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK],
[
no_qt=""
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
if test x$PKG_CONFIG != xno ; then
if pkg-config --atleast-pkgconfig-version 0.7 ; then