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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,7 @@ AC_DEFINE_UNQUOTED(CM_DBUS_BASE_PATH,"$C
AC_DEFINE_UNQUOTED(CM_DBUS_RECONNECT_TIMEOUT,30,
[Define to the amount of time to wait between attempts to reconnect to the message bus if we get disconnected.])
+PKG_PROG_PKG_CONFIG
if ! ${configure_dist_target_only:-false} ; then
AC_CHECK_HEADERS(sys/types.h sys/socket.h linux/types.h linux/netlink.h linux/rtnetlink.h,,,[
#ifdef HAVE_SYS_TYPES_H
@@ -175,13 +176,13 @@ if ! ${configure_dist_target_only:-false
AC_ARG_WITH(session-bus-services-dir,
AS_HELP_STRING([--with-session-bus-services-dir=],[directory to install session bus configuration]),
SESSIONBUSSERVICESDIR=$withval,
- SESSIONBUSSERVICESDIR=`pkg-config --variable=session_bus_services_dir dbus-1 2> /dev/null | sed -e "s|^${datadir}|\${datadir}|g" -e "s|^${datarootdir}|\${datarootdir}|g" -e "s|^${prefix}/share|\${datadir}|g"`)
+ SESSIONBUSSERVICESDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1 2> /dev/null | sed -e "s|^${datadir}|\${datadir}|g" -e "s|^${datarootdir}|\${datarootdir}|g" -e "s|^${prefix}/share|\${datadir}|g"`)
AC_SUBST(SESSIONBUSSERVICESDIR)
AM_CONDITIONAL(SESSIONBUS,test x$SESSIONBUSSERVICESDIR != xno)
AC_ARG_WITH(system-bus-services-dir,
AS_HELP_STRING([--with-system-bus-services-dir=],[directory to install system bus configuration]),
SESSIONBUSSERVICESDIR=$withval,
- SYSTEMBUSSERVICESDIR=`pkg-config --variable=system_bus_services_dir dbus-1 2> /dev/null | sed -e "s|^${datadir}|\${datadir}|g" -e "s|^${datarootdir}|\${datarootdir}|g" -e "s|^${prefix}/share|\${datadir}|g"`)
+ SYSTEMBUSSERVICESDIR=`$PKG_CONFIG --variable=system_bus_services_dir dbus-1 2> /dev/null | sed -e "s|^${datadir}|\${datadir}|g" -e "s|^${datarootdir}|\${datarootdir}|g" -e "s|^${prefix}/share|\${datadir}|g"`)
AC_SUBST(SYSTEMBUSSERVICESDIR)
AM_CONDITIONAL(SYSTEMBUS,test x$SYSTEMBUSSERVICESDIR != xno)
@@ -344,7 +345,7 @@ if ! ${configure_dist_target_only:-false
AM_CONDITIONAL(HAVE_OPENSSL,test x$withopenssl != xno)
if test x$withopenssl != xno ; then
- if pkg-config libcrypto 2> /dev/null ; then
+ if $PKG_CONFIG libcrypto 2> /dev/null ; then
PKG_CHECK_MODULES(OPENSSL,libcrypto)
PKG_CHECK_MODULES(OPENSSL_SSL,libssl libcrypto)
else
@@ -417,7 +418,7 @@ if ! ${configure_dist_target_only:-false
AM_CONDITIONAL(HAVE_NSS,test x$withnss != xno)
if test x$withnss != xno ; then
- if pkg-config mozilla-nss 2> /dev/null ; then
+ if $PKG_CONFIG mozilla-nss 2> /dev/null ; then
PKG_CHECK_MODULES(NSS,mozilla-nss)
else
PKG_CHECK_MODULES(NSS,nss)
@@ -548,7 +549,7 @@ if ! ${configure_dist_target_only:-false
AM_CONDITIONAL(SYSTEMD,test x$SYSTEMD != xno)
AC_SUBST(SYSTEMDSYSTEMUNITDIR)
if test x$SYSTEMD = xyes ; then
- SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd 2> /dev/null`
+ SYSTEMDSYSTEMUNITDIR=`$PKG_CONFIG --variable=systemdsystemunitdir systemd 2> /dev/null`
AC_MSG_RESULT(will install systemd unit files to $SYSTEMDSYSTEMUNITDIR)
fi
@@ -616,7 +617,7 @@ if ! ${configure_dist_target_only:-false
CFLAGS="$CFLAGSsave"
LIBS="$LIBSsave"
can_dsa=true
- if ! pkg-config --atleast-version=1.0 openssl ; then
+ if ! $PKG_CONFIG --atleast-version=1.0 openssl ; then
# CSR signing appears to be broken in 0.9.8e, so reject < 1.0
can_dsa=false
fi
@@ -820,7 +821,7 @@ if ! ${configure_dist_target_only:-false
PKG_CHECK_MODULES(UUID,uuid)
else
if test x$with_uuid != xno ; then
- if pkg-config uuid ; then
+ if $PKG_CONFIG uuid ; then
PKG_CHECK_MODULES(UUID,uuid)
uuid=yes
fi
|
