commit - 814d74c9aaeb95536923ba995adfc5ac50464739
commit + 3a9f646cf520cb09e23e74cf150460e7c159cd0c
blob - 4e61c324c9b6c6d2d37d2cb800b1f0c732c2fd7c
blob + 25818843508a92cf65312408fee40abe2028abc0
--- configure
+++ configure
SHAREDIR where to install misc files (PREFIX/share)
SBINDIR where to install system executables (PREFIX/sbin)
INCLUDEDIR where to install header files (PREFIX/include)
- PKG_CONFIG path to the pkg-config program or empty to disable
+ PKG_CONFIG path to the pkg-config program or \`false'
Additionally, the following environment variables are used if set:
}
}
-command -v pkg-config 2>/dev/null 1>&2 && {
- PKG_CONFIG=pkg-config
- echo "pkg-config found" 1>&2
- echo "pkg-config found" 1>&3
-} || {
- echo "pkg-config not found" 1>&2
- echo "pkg-config not found" 1>&3
-}
-
#----------------------------------------------------------------------
# Allow certain variables to be overriden on the command line.
#----------------------------------------------------------------------
esac
done
+test -z "${PKG_CONFIG}" && {
+ command -v pkg-config 2>/dev/null >&2 && {
+ PKG_CONFIG="$(command -v pkg-config)"
+ echo "found pkg-config: $PKG_CONFIG" 1>&2
+ echo "found pkg-config: $PKG_CONFIG" 1>&3
+ } || {
+ PKG_CONFIG=false
+ echo "pkg-config not found" 1>&2
+ echo "pkg-config not found" 1>&3
+ }
+}
#----------------------------------------------------------------------
# These are the values that will be pushed into config.h after we test
echo "${1}: ${CC} succeeded" 1>&3
extralib="(with ${5})"
else
- test -n "${PKG_CONFIG}" -a -n "${6}" && ${PKG_CONFIG} "$6"
+ test -n "${6}" && ${PKG_CONFIG} "$6"
if [ $? -eq 0 ]; then
echo "${1}: ${CC} failed with $? (retrying)" 1>&3
pkgcfs=$($PKG_CONFIG --cflags "${6}")
blob - 1a4f64ba577477d9676b7c3834d1a6682489b9e7
blob + 88d8d3839f391e49ea45268c33cd39c0a8e8a434
--- configure.local.example
+++ configure.local.example
LDADD_LIB_SOCKET=
# To disable the autoconfiguration via pkg-config set PKG_CONFIG to
-# `false' or to the empty string:
+# `false':
-PKG_CONFIG=
+PKG_CONFIG=false
# It is possible to change the utility program used for installation
# and the modes files are installed with. The defaults are: