Changeset View
Changeset View
Standalone View
Standalone View
head/net-mgmt/collectd5/files/patch-configure.ac
--- configure.ac.orig 2015-02-26 11:49:16 UTC | --- configure.ac.orig 2015-02-26 11:49:16 UTC | ||||
+++ configure.ac | +++ configure.ac | ||||
@@ -111,7 +111,7 @@ then | @@ -120,7 +120,7 @@ then | ||||
fi | fi | ||||
# Where to install .pc files. | # Where to install .pc files. | ||||
-pkgconfigdir="${libdir}/pkgconfig" | -pkgconfigdir="${libdir}/pkgconfig" | ||||
+pkgconfigdir="${prefix}/libdata/pkgconfig" | +pkgconfigdir="${prefix}/libdata/pkgconfig" | ||||
AC_SUBST(pkgconfigdir) | AC_SUBST(pkgconfigdir) | ||||
# Check for standards compliance mode | # Check for standards compliance mode | ||||
@@ -1440,6 +1440,7 @@ if test "x$with_kstat" = "xyes" | @@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes" | ||||
then | then | ||||
AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], []) | AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], []) | ||||
fi | fi | ||||
+ | + | ||||
if test "x$with_kstat" = "xyes" | if test "x$with_kstat" = "xyes" | ||||
then | then | ||||
AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], []) | AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], []) | ||||
@@ -1449,6 +1450,8 @@ if test "x$with_kstat" = "xyes" | @@ -1504,6 +1505,8 @@ if test "x$with_kstat" = "xyes" | ||||
then | then | ||||
AC_DEFINE(HAVE_LIBKSTAT, 1, | AC_DEFINE(HAVE_LIBKSTAT, 1, | ||||
[Define to 1 if you have the 'kstat' library (-lkstat)]) | [Define to 1 if you have the 'kstat' library (-lkstat)]) | ||||
+ BUILD_WITH_LIBKSTAT_LIBS="-lkstat" | + BUILD_WITH_LIBKSTAT_LIBS="-lkstat" | ||||
+ AC_SUBST(BUILD_WITH_LIBKSTAT_LIBS) | + AC_SUBST(BUILD_WITH_LIBKSTAT_LIBS) | ||||
fi | fi | ||||
AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes") | AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes") | ||||
AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes") | AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes") | ||||
@@ -3508,7 +3511,7 @@ fi | @@ -3629,7 +3632,7 @@ fi | ||||
if test "x$with_python" = "xyes" | if test "x$with_python" = "xyes" | ||||
then | then | ||||
LDFLAGS="-L$python_library_path $LDFLAGS" | LDFLAGS="-L$python_library_path $LDFLAGS" | ||||
- LIBS="$python_library_flags $LIBS" | - LIBS="$python_library_flags $LIBS" | ||||
+ LIBS="$python_library_flags $LIBS -lm -lpthread -lutil" | + LIBS="$python_library_flags $LIBS -lm -lpthread -lutil" | ||||
AC_CHECK_FUNC(PyObject_CallFunction, | AC_CHECK_FUNC(PyObject_CallFunction, | ||||
[with_python="yes"], | [with_python="yes"], | ||||
@@ -4415,7 +4418,7 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING( | @@ -4692,8 +4695,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING( | ||||
else if test -d "$with_libvarnish/lib" | |||||
then | then | ||||
AC_MSG_NOTICE([Not checking for libvarnish: Manually configured]) | AC_MSG_NOTICE([Not checking for libvarnish: Manually configured]) | ||||
with_libvarnish_cflags="-I$withval/include" | - with_libvarnish_cflags="-I$withval/include" | ||||
- with_libvarnish_libs="-L$withval/lib -lvarnishapi" | - with_libvarnish_libs="-L$withval/lib -lvarnishapi" | ||||
+ with_libvarnish_cflags="-I$withval/include/varnish" | |||||
+ with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi" | + with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi" | ||||
with_libvarnish="yes" | with_libvarnish="yes" | ||||
fi; fi; fi | fi; fi; fi | ||||
], | ], |