configure and makefiles now get libuuid optional parameters to bypass broken pkg-config
Costa Tsaousis committed
May 14, 2016 at 02:34 UTC
af5c458f1c3b297dca1c28e5843cda34dad4abcf
2 files changed
+12
-2
configure.ac
+10
-2
@@ -92,8 +92,14 @@ if test -z "${MATH_LIBS}"; then
92
)
93
fi
94
95
-AC_CHECK_LIB([uuid], [uuid_generate_time_safe], [], \
96
- [AC_MSG_ERROR([libuuid required but not found. Try installing 'uuid-dev' or 'libuuid-devel'.])])
95
+PKG_CHECK_MODULES(
96
+ [UUID],
97
+ [uuid],
98
+)
99
+test -z "${UUID_LIBS}" && AC_MSG_ERROR([libuuid required but not found. Try installing 'uuid-dev' or 'libuuid-devel'.])
100
+AC_DEFINE([NETDATA_WITH_UUID], [1], [uuid settings])
101
+OPTIONAL_UUID_CLFAGS="${UUID_CFLAGS}"
102
+OPTIONAL_UUID_LIBS="${UUID_LIBS}"
103
104
if test "${enable_plugin_nfacct}" = "yes"; then
105
PKG_CHECK_MODULES(
@@ -157,6 +163,8 @@ AC_SUBST([OPTIONAL_NFACCT_CLFAGS])
163
AC_SUBST([OPTIONAL_NFACCT_LIBS])
164
AC_SUBST([OPTIONAL_ZLIB_CLFAGS])
165
AC_SUBST([OPTIONAL_ZLIB_LIBS])
166
+AC_SUBST([OPTIONAL_UUID_CLFAGS])
167
+AC_SUBST([OPTIONAL_UUID_LIBS])
168
169
AC_CONFIG_FILES([
170
Makefile
src/Makefile.am
+2
@@ -16,6 +16,7 @@ AM_CFLAGS = \
16
$(OPTIONAL_MATH_CFLAGS) \
17
$(OPTIONAL_NFACCT_CLFAGS) \
18
$(OPTIONAL_ZLIB_CFLAGS) \
19
+ $(OPTIONAL_UUID_CFLAGS) \
20
$(NULL)
21
22
sbin_PROGRAMS = netdata
@@ -73,6 +74,7 @@ netdata_LDADD = \
74
$(OPTIONAL_MATH_LIBS) \
75
$(OPTIONAL_NFACCT_LIBS) \
76
$(OPTIONAL_ZLIB_LIBS) \
77
+ $(OPTIONAL_UUID_LIBS) \
78
$(NULL)
79
80
apps_plugin_SOURCES = \