Merge pull request #528 from paulfantom/master

[netdata.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 87eb192831ab14da137e52a436452e20a3932a33..371286fdc15dfc9c540065fcdbfeac4cb7d70f35 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [1])
-define([VERSION_MINOR], [1])
+define([VERSION_MINOR], [2])
 define([VERSION_FIX], [1])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [_master])
@@ -34,6 +34,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 PKG_PROG_PKG_CONFIG
 AC_USE_SYSTEM_EXTENSIONS
+AC_CHECK_FUNCS_ONCE(accept4)
 
 AC_ARG_ENABLE(
        [plugin-nfacct],
@@ -92,8 +93,14 @@ if test -z "${MATH_LIBS}"; then
        )
 fi
 
-AC_CHECK_LIB([uuid], [uuid_generate_time_safe], [], \
-             [AC_MSG_ERROR([libuuid required but not found. Try installing 'uuid-dev' or 'uuid-devel'.])])
+PKG_CHECK_MODULES(
+       [UUID],
+       [uuid],
+)
+test -z "${UUID_LIBS}" && AC_MSG_ERROR([libuuid required but not found. Try installing 'uuid-dev' or 'libuuid-devel'.])
+AC_DEFINE([NETDATA_WITH_UUID], [1], [uuid settings])
+OPTIONAL_UUID_CLFAGS="${UUID_CFLAGS}"
+OPTIONAL_UUID_LIBS="${UUID_LIBS}"
 
 if test "${enable_plugin_nfacct}" = "yes"; then
        PKG_CHECK_MODULES(
@@ -146,6 +153,7 @@ AC_SUBST([varlibdir], ["\$(localstatedir)/lib/netdata"])
 AC_SUBST([cachedir], ["\$(localstatedir)/cache/netdata"])
 AC_SUBST([chartsdir], ["\$(libexecdir)/netdata/charts.d"])
 AC_SUBST([nodedir], ["\$(libexecdir)/netdata/node.d"])
+AC_SUBST([pythondir], ["\$(libexecdir)/netdata/python.d"])
 AC_SUBST([configdir], ["\$(sysconfdir)/netdata"])
 AC_SUBST([logdir], ["\$(localstatedir)/log/netdata"])
 AC_SUBST([pluginsdir], ["\$(libexecdir)/netdata/plugins.d"])
@@ -157,12 +165,15 @@ AC_SUBST([OPTIONAL_NFACCT_CLFAGS])
 AC_SUBST([OPTIONAL_NFACCT_LIBS])
 AC_SUBST([OPTIONAL_ZLIB_CLFAGS])
 AC_SUBST([OPTIONAL_ZLIB_LIBS])
+AC_SUBST([OPTIONAL_UUID_CLFAGS])
+AC_SUBST([OPTIONAL_UUID_LIBS])
 
 AC_CONFIG_FILES([
        Makefile
        charts.d/Makefile
        conf.d/Makefile
        netdata.spec
+       python.d/Makefile
        node.d/Makefile
        plugins.d/Makefile
        src/Makefile