1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
Description: Use PKG_PROG_PKG_CONFIG macro to search for pkg-config. It is cross-compile safe.
Author: Sven Hartge <sven@svenhartge.de>
Bug: https://bugs.bacula.org/view.php?id=2425
Last-Update: 2018-02-27
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -153,7 +153,10 @@
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 @@
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"
|
