projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6207fce
)
don't assume pkg-config is in PATH
author
Lauri Tirkkonen
<lotheac@iki.fi>
Thu, 22 May 2014 11:05:40 +0000
(14:05 +0300)
committer
Marc Fournier
<marc.fournier@camptocamp.com>
Fri, 20 Jun 2014 15:19:09 +0000
(17:19 +0200)
configure.in
patch
|
blob
|
history
diff --git
a/configure.in
b/configure.in
index
0b12630
..
7086800
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1136,8
+1136,8
@@
AC_CHECK_LIB(hal,libhal_device_property_exists,
[with_libhal="no"])
if test "x$with_libhal" = "xyes"; then
if test "x$PKG_CONFIG" != "x"; then
[with_libhal="no"])
if test "x$with_libhal" = "xyes"; then
if test "x$PKG_CONFIG" != "x"; then
- BUILD_WITH_LIBHAL_CFLAGS="`
pkg-config
--cflags hal`"
- BUILD_WITH_LIBHAL_LIBS="`
pkg-config
--libs hal`"
+ BUILD_WITH_LIBHAL_CFLAGS="`
$PKG_CONFIG
--cflags hal`"
+ BUILD_WITH_LIBHAL_LIBS="`
$PKG_CONFIG
--libs hal`"
AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
fi
AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
fi
@@
-3434,8
+3434,8
@@
then
if $PKG_CONFIG --exists tokyotyrant
then
with_libtokyotyrant_cppflags="$with_libtokyotyrant_cppflags `$PKG_CONFIG --cflags tokyotyrant`"
if $PKG_CONFIG --exists tokyotyrant
then
with_libtokyotyrant_cppflags="$with_libtokyotyrant_cppflags `$PKG_CONFIG --cflags tokyotyrant`"
- with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `
pkg-config
--libs-only-L tokyotyrant`"
- with_libtokyotyrant_libs="$with_libtokyotyrant_libs `
pkg-config
--libs-only-l tokyotyrant`"
+ with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `
$PKG_CONFIG
--libs-only-L tokyotyrant`"
+ with_libtokyotyrant_libs="$with_libtokyotyrant_libs `
$PKG_CONFIG
--libs-only-l tokyotyrant`"
fi
fi
fi
fi
@@
-3743,7
+3743,7
@@
with_libvirt_cflags=""
with_libvirt_ldflags=""
if test "x$PKG_CONFIG" != "x"
then
with_libvirt_ldflags=""
if test "x$PKG_CONFIG" != "x"
then
-
pkg-config
--exists 'libxml-2.0' 2>/dev/null
+
$PKG_CONFIG
--exists 'libxml-2.0' 2>/dev/null
if test "$?" = "0"
then
with_libxml2="yes"
if test "$?" = "0"
then
with_libxml2="yes"
@@
-3751,7
+3751,7
@@
then
with_libxml2="no (pkg-config doesn't know library)"
fi
with_libxml2="no (pkg-config doesn't know library)"
fi
-
pkg-config
--exists libvirt 2>/dev/null
+
$PKG_CONFIG
--exists libvirt 2>/dev/null
if test "$?" = "0"
then
with_libvirt="yes"
if test "$?" = "0"
then
with_libvirt="yes"
@@
-3761,12
+3761,12
@@
then
fi
if test "x$with_libxml2" = "xyes"
then
fi
if test "x$with_libxml2" = "xyes"
then
- with_libxml2_cflags="`
pkg-config
--cflags libxml-2.0`"
+ with_libxml2_cflags="`
$PKG_CONFIG
--cflags libxml-2.0`"
if test $? -ne 0
then
with_libxml2="no"
fi
if test $? -ne 0
then
with_libxml2="no"
fi
- with_libxml2_ldflags="
`pkg-config
--libs libxml-2.0`"
+ with_libxml2_ldflags="
$PKG_CONFIG
--libs libxml-2.0`"
if test $? -ne 0
then
with_libxml2="no"
if test $? -ne 0
then
with_libxml2="no"
@@
-3806,12
+3806,12
@@
if test "x$with_libxml2" = "xyes"; then
fi
if test "x$with_libvirt" = "xyes"
then
fi
if test "x$with_libvirt" = "xyes"
then
- with_libvirt_cflags="
`pkg-config
--cflags libvirt`"
+ with_libvirt_cflags="
$PKG_CONFIG
--cflags libvirt`"
if test $? -ne 0
then
with_libvirt="no"
fi
if test $? -ne 0
then
with_libvirt="no"
fi
- with_libvirt_ldflags="
`pkg-config
--libs libvirt`"
+ with_libvirt_ldflags="
$PKG_CONFIG
--libs libvirt`"
if test $? -ne 0
then
with_libvirt="no"
if test $? -ne 0
then
with_libvirt="no"