From: Sven Hartge <sven@svenhartge.de>
Date: Tue, 2 Feb 2021 16:17:14 +0000 (+0100)
Subject: Use PKG_PROG_PKG_CONFIG macro to search for pkg-config. It is cross-compile safe.
X-Git-Tag: Release-11.0.1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68dcab117b2a738fbc6d81aa55f9414e8012e8ee;p=thirdparty%2Fbacula.git

Use PKG_PROG_PKG_CONFIG macro to search for pkg-config. It is cross-compile safe.
---

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 3ed5af5f8..933f5ad29 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -153,7 +153,10 @@ AC_PATH_PROG(PYTHON, python, python)
 AC_PATH_PROG(GROWISOFS, growisofs, growisofs)
 AC_PATH_PROG(DVDRWMEDIAINFO, dvd+rw-mediainfo, dvd+rw-mediainfo)
 AC_PATH_PROG(DVDRWFORMAT, dvd+rw-format, dvd+rw-format)
-AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config)
+dnl Using AC_PATH_PROG() to find pkg-config is not cross-compile safe.
+dnl The macro PKG_PROG_PKG_CONFIG avoids this problem.
+dnl AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config)
+PKG_PROG_PKG_CONFIG()
 AC_PATH_PROG(QMAKE, qmake, none)
 AC_PATH_PROG(GMAKE, gmake, none)
 AC_PATH_PROG(PIDOF, pidof, pidof)
@@ -418,13 +421,13 @@ AC_ARG_ENABLE(bat,
 BAT_DIR=
 if test x$support_bat = xyes; then
 dnl look for Qt4
-   abc=`$PKGCONFIG QtGui`
+   abc=`$PKG_CONFIG QtGui`
    pkg=$?
    if test $pkg = 0; then
       BAT_DIR=src/qt-console
    else
 dnl look for Qt5
-     abc=`$PKGCONFIG Qt5Gui`
+     abc=`$PKG_CONFIG Qt5Gui`
      pkg=$?
      if test $pkg = 0; then
 	BAT_DIR="src/qt-console src/qt-console/tray-monitor"
@@ -3800,7 +3803,7 @@ fi
 cd src/qt-console
 chmod 755 install_conf_file build-depkgs-qt-console
 cd tray-monitor
-chmod 755 install_conf_file 
+chmod 755 install_conf_file
 cd ${BUILD_DIR}
 
 cd scripts