From 9d6531aa5e5f7322ae6df10f18dd64561bd5599a Mon Sep 17 00:00:00 2001
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Mar 29 2019 01:39:47 +0000
Subject: Use pkg-config from the host system to better support cross-compiling


---

diff --git a/m4/mozldap.m4 b/m4/mozldap.m4
index 255bd27..76d3300 100644
--- a/m4/mozldap.m4
+++ b/m4/mozldap.m4
@@ -109,7 +109,6 @@ AC_MSG_RESULT(no))
 # last resort
 if test "$with_ldapsdk" = yes ; then
   if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config)
     AC_MSG_CHECKING(for mozldap with pkg-config)
     if test -n "$PKG_CONFIG"; then
       if $PKG_CONFIG --exists mozldap6; then
diff --git a/m4/openldap.m4 b/m4/openldap.m4
index 70e01f5..58533d6 100644
--- a/m4/openldap.m4
+++ b/m4/openldap.m4
@@ -97,7 +97,6 @@ AC_MSG_RESULT(no))
 
 if test "$with_openldap" = yes ; then # user wants to use openldap, but didn't specify paths
   if test -z "$openldap_inc" -o -z "$openldap_lib" -o -z "$openldap_libdir" -o -z "$openldap_bindir"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config)
     AC_MSG_CHECKING(for OpenLDAP with pkg-config)
     if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists openldap; then
       openldap_inc=`$PKG_CONFIG --cflags-only-I openldap`