Page MenuHomeFreeBSD
Differential D8028 Diff 20680 net-mgmt/collectd5/files/patch-configure.ac

Changeset View

Standalone View

View Options

net-mgmt/collectd5/files/patch-configure.ac

--- configure.ac.orig 2016-01-22 09:51:17 UTC --- configure.ac.orig 2016-09-11 08:10:25 UTC
+++ configure.ac +++ configure.ac
@@ -155,7 +155,7 @@ then @@ -185,7 +185,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
@@ -715,7 +715,7 @@ SAVE_CFLAGS="$CFLAGS" @@ -841,7 +841,7 @@ SAVE_CFLAGS="$CFLAGS"
# Emulate behavior of src/Makefile.am # Emulate behavior of src/Makefile.am
if test "x$GCC" = "xyes" if test "x$GCC" = "xyes"
then then
- CFLAGS="$CFLAGS -Wall -Werror" - CFLAGS="$CFLAGS -Wall -Werror"
+ CFLAGS="$CFLAGS -Wall " + CFLAGS="$CFLAGS -Wall "
fi fi
AC_CACHE_CHECK([for strtok_r], AC_CACHE_CHECK([for strtok_r],
@@ -844,7 +844,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen @@ -968,7 +968,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
if test "x$GCC" = "xyes" if test "x$GCC" = "xyes"
then then
SAVE_CFLAGS="$CFLAGS" SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Wall -Wextra -Werror" - CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+ CFLAGS="$CFLAGS -Wall -Wextra " + CFLAGS="$CFLAGS -Wall -Wextra "
fi fi
AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"]) AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
@@ -1571,6 +1571,7 @@ if test "x$with_kstat" = "xyes" @@ -1757,6 +1757,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)"], [])
@@ -1580,6 +1581,8 @@ if test "x$with_kstat" = "xyes" @@ -1766,6 +1767,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")
@@ -2624,8 +2627,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([ @@ -3053,8 +3056,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([
with_libmongoc="no" with_libmongoc="no"
else else
with_libmongoc="yes" with_libmongoc="yes"
- LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include" - LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include"
- LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib" - LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib"
+ LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0" + LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0"
+ LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib -lsasl2 -lssl -lcrypto -lmongoc-1.0 -lbson-1.0" + LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib -lsasl2 -lssl -lcrypto -lmongoc-1.0 -lbson-1.0"
fi; fi fi; fi
], ],
[with_libmongoc="yes"]) [with_libmongoc="yes"])
@@ -2642,7 +2645,7 @@ then @@ -3071,7 +3074,7 @@ then
then then
AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS]) AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS])
fi fi
- AC_CHECK_HEADERS(mongo.h, - AC_CHECK_HEADERS(mongo.h,
+ AC_CHECK_HEADERS(mongoc.h, + AC_CHECK_HEADERS(mongoc.h,
[with_libmongoc="yes"], [with_libmongoc="yes"],
[with_libmongoc="no ('mongo.h' not found)"], [with_libmongoc="no ('mongo.h' not found)"],
[#if HAVE_STDINT_H [#if HAVE_STDINT_H
@@ -2658,7 +2661,7 @@ then @@ -3087,7 +3090,7 @@ then
then then
AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS]) AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS])
fi fi
- AC_CHECK_LIB(mongoc, mongo_run_command, - AC_CHECK_LIB(mongoc, mongo_run_command,
+ AC_CHECK_LIB(mongoc-1.0, mongoc_client_command, + AC_CHECK_LIB(mongoc-1.0, mongoc_client_command,
[with_libmongoc="yes"], [with_libmongoc="yes"],
[with_libmongoc="no (symbol 'mongo_run_command' not found)"]) [with_libmongoc="no (symbol 'mongo_run_command' not found)"])
fi fi
@@ -3415,7 +3418,7 @@ then @@ -3873,7 +3876,7 @@ then
SAVE_LIBS="$LIBS" SAVE_LIBS="$LIBS"
# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3) # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
# (see issues #41 and #42) # (see issues #41 and #42)
- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror" - CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
+ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall " + CFLAGS="$CFLAGS $PERL_CFLAGS -Wall "
LIBS="$LIBS $PERL_LIBS" LIBS="$LIBS $PERL_LIBS"
AC_CACHE_CHECK([for broken Perl_load_module()], AC_CACHE_CHECK([for broken Perl_load_module()],
@@ -3645,7 +3648,7 @@ fi @@ -5249,8 +5252,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
if test "x$with_python" = "xyes"
then
AC_MSG_CHECKING([for Python CPPFLAGS])
- python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>&1`
+ python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>/dev/null`
python_config_status=$?
if test "$python_config_status" -ne 0 || test "x$python_include_path" = "x"
@@ -3668,7 +3671,7 @@ fi
if test "x$with_python" = "xyes"
then
AC_MSG_CHECKING([for Python LDFLAGS])
- python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>&1`
+ python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>/dev/null`
python_config_status=$?
if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x"
@@ -3683,7 +3686,7 @@ fi
if test "x$with_python" = "xyes"
then
AC_MSG_CHECKING([for Python LIBS])
- python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
+ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>/dev/null`
python_config_status=$?
if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
@@ -3698,7 +3701,7 @@ fi
if test "x$with_python" = "xyes"
then
LDFLAGS="-L$python_library_path $LDFLAGS"
- LIBS="$python_library_flags $LIBS"
+ LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
AC_CHECK_FUNC(PyObject_CallFunction,
[with_python="yes"],
@@ -4761,8 +4764,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
else if test -d "$with_libvarnish/lib" 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_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
], ],
@@ -5334,6 +5337,7 @@ fi
if test "x$ac_system" = "xFreeBSD"
then
+ plugin_disk="yes"
plugin_zfs_arc="yes"
fi