configure and makefiles now get libuuid optional parameters to bypass broken pkg...

diff --git a/configure.ac b/configure.ac
index d8c09053d332bfedbef43eb2e5cf241b91030fc8..568a4ea87d09839f053ce522e47853a98d132e8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,8 +92,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 'libuuid-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(
@@ -157,6 +163,8 @@ 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

diff --git a/src/Makefile.am b/src/Makefile.am
index 00281a3e2437a6aac696268f5fa4d521c7e45751..98aa04bca02840ac83a553d9a1ccc839a3412783 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,7 @@ AM_CFLAGS = \
        $(OPTIONAL_MATH_CFLAGS) \
        $(OPTIONAL_NFACCT_CLFAGS) \
        $(OPTIONAL_ZLIB_CFLAGS) \
+       $(OPTIONAL_UUID_CFLAGS) \
        $(NULL)
 
 sbin_PROGRAMS = netdata
@@ -73,6 +74,7 @@ netdata_LDADD = \
        $(OPTIONAL_MATH_LIBS) \
        $(OPTIONAL_NFACCT_LIBS) \
        $(OPTIONAL_ZLIB_LIBS) \
+       $(OPTIONAL_UUID_LIBS) \
        $(NULL)
 
 apps_plugin_SOURCES = \