X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=blobdiff_plain;f=configure.ac;h=663f0a395a191049879c1a91ef1e15b5090577c5;hp=fe770dc37300d90d3c26da1708c6818c6c3020c5;hb=aa6b96fc2d421517a59a1aaaf91be5f201d34287;hpb=117fa1c86034f5002b4e53ad3862a28295ebba68

diff --git a/configure.ac b/configure.ac
index fe770dc3..663f0a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [1])
-define([VERSION_MINOR], [5])
+define([VERSION_MINOR], [6])
 define([VERSION_FIX], [1])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [_rolling])
@@ -48,58 +48,64 @@ AC_USE_SYSTEM_EXTENSIONS
 # configurable options
 
 AC_ARG_ENABLE(
-	[plugin-nfacct],
-	[AS_HELP_STRING([--enable-plugin-nfacct], [enable nfacct plugin, requires root])],
-	,
-	[enable_plugin_nfacct="no"]
+    [plugin-nfacct],
+    [AS_HELP_STRING([--enable-plugin-nfacct], [enable nfacct plugin, requires root])],
+    ,
+    [enable_plugin_nfacct="no"]
 )
 AC_ARG_ENABLE(
-	[plugin-freeipmi],
-	[AS_HELP_STRING([--enable-plugin-freeipmi], [freeipmi plugin, requires root])],
-	,
-	[enable_plugin_freeipmi="detect"]
+    [plugin-freeipmi],
+    [AS_HELP_STRING([--enable-plugin-freeipmi], [enable freeipmi plugin])],
+    ,
+    [enable_plugin_freeipmi="detect"]
 )
 AC_ARG_ENABLE(
-	[pedantic],
-	[AS_HELP_STRING([--enable-pedantic], [enable pedantic compiler warnings])],
-	,
-	[enable_pedantic="no"]
+    [pedantic],
+    [AS_HELP_STRING([--enable-pedantic], [enable pedantic compiler warnings])],
+    ,
+    [enable_pedantic="no"]
 )
 AC_ARG_WITH(
-	[webdir],
-	[AS_HELP_STRING([--with-webdir], [location of webdir @<:@PKGDATADIR/web@:>@])],
-	[webdir="${withval}"],
-	[webdir="\$(pkgdatadir)/web"]
+    [webdir],
+    [AS_HELP_STRING([--with-webdir], [location of webdir @<:@PKGDATADIR/web@:>@])],
+    [webdir="${withval}"],
+    [webdir="\$(pkgdatadir)/web"]
 )
 AC_ARG_WITH(
-	[libcap],
-	[AS_HELP_STRING([--with-libcap], [build with libcap])],
-	,
-	[with_libcap="detect"]
+    [libcap],
+    [AS_HELP_STRING([--with-libcap], [build with libcap])],
+    ,
+    [with_libcap="detect"]
 )
 AC_ARG_WITH(
-	[zlib],
-	[AS_HELP_STRING([--with-zlib], [build with zlib])],
-	,
-	[with_zlib="yes"]
+    [zlib],
+    [AS_HELP_STRING([--with-zlib], [build with zlib])],
+    ,
+    [with_zlib="yes"]
 )
 AC_ARG_WITH(
-	[math],
-	[AS_HELP_STRING([--with-math], [build with math])],
-	,
-	[with_math="yes"]
+    [math],
+    [AS_HELP_STRING([--with-math], [build with math])],
+    ,
+    [with_math="yes"]
 )
 AC_ARG_WITH(
-	[user],
-	[AS_HELP_STRING([--with-user], [use this user to drop privilege])],
-	,
-	[with_user="nobody"]
+    [user],
+    [AS_HELP_STRING([--with-user], [use this user to drop privilege])],
+    ,
+    [with_user="nobody"]
 )
 AC_ARG_ENABLE(
-	[x86-sse],
-	[AS_HELP_STRING([--disable-x86-sse], [SSE/SS2 optimizations on x86 @<:@default enabled@:>@])],
-	,
-	[enable_x86_sse="yes"]
+    [x86-sse],
+    [AS_HELP_STRING([--disable-x86-sse], [SSE/SS2 optimizations on x86 @<:@default enabled@:>@])],
+    ,
+    [enable_x86_sse="yes"]
+)
+AC_ARG_ENABLE(
+    [lto],
+    [AS_HELP_STRING([--disable-lto], [Link Time Optimizations @<:@default enabled@:>@])],
+    ,
+    [enable_lto="detect"]
 )
 
 
@@ -145,49 +151,24 @@ AC_CHECK_HEADERS_ONCE([sys/prctl.h])
 # -----------------------------------------------------------------------------
 # operating system detection
 
+AC_MSG_CHECKING([operating system])
 case "$host_os" in
 freebsd*)
-	build_target=freebsd
-	;;
+    build_target=freebsd
+    ;;
 darwin*)
-	build_target=macos
-	LDFLAGS="${LDFLAGS} -framework CoreFoundation -framework IOKit"
-	;;
+    build_target=macos
+    LDFLAGS="${LDFLAGS} -framework CoreFoundation -framework IOKit"
+    ;;
 *)
-	build_target=linux
-	;;
+    build_target=linux
+    ;;
 esac
 
 AM_CONDITIONAL([FREEBSD], [test "${build_target}" = "freebsd"])
 AM_CONDITIONAL([MACOS], [test "${build_target}" = "macos"])
 AM_CONDITIONAL([LINUX], [test "${build_target}" = "linux"])
-
-
-# -----------------------------------------------------------------------------
-# compiler options
-
-AC_ARG_VAR([SSE_CANDIDATE], [C compiler flags for SSE])
-AS_CASE([$host_cpu],
-	[i?86], [SSE_CANDIDATE="yes"]
-)
-AC_SUBST([SSE_CANDIDATE])
-if test "${SSE_CANDIDATE}" = "yes" -a "${enable_x86_sse}" = "yes"; then
-	opt="-msse2 -mfpmath=sse"
-	AX_CHECK_COMPILE_FLAG($opt, [CFLAGS="$CFLAGS $opt"], [])
-fi
-
-if test "${GCC}" = "yes"; then
-	AC_DEFINE_UNQUOTED([likely(x)], [__builtin_expect(!!(x), 1)], [gcc branch optimization])
-	AC_DEFINE_UNQUOTED([unlikely(x)], [__builtin_expect(!!(x), 0)], [gcc branch optimization])
-else
-	AC_DEFINE_UNQUOTED([likely(x)], [(x)], [gcc branch optimization])
-	AC_DEFINE_UNQUOTED([unlikely(x)], [(x)], [gcc branch optimization])
-fi
-
-if test "${enable_pedantic}" = "yes"; then
-	enable_strict="yes"
-	CFLAGS="${CFLAGS} -pedantic -Wall -Wextra -Wno-long-long"
-fi
+AC_MSG_RESULT([${build_target}])
 
 
 # -----------------------------------------------------------------------------
@@ -199,94 +180,143 @@ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 CC="${PTHREAD_CC}"
 
 
-# -----------------------------------------------------------------------------
-# memory allocation library
-
-TS_CHECK_JEMALLOC
-if test "$has_jemalloc" = "1"; then
-	AC_DEFINE([ENABLE_JEMALLOC], [1], [compile and link with jemalloc])
-else
-	TS_CHECK_TCMALLOC
-	if test "$has_tcmalloc" = "1"; then
-		AC_DEFINE([ENABLE_TCMALLOC], [1], [compile and link with tcmalloc])
-	else
-		AC_C_MALLOPT
-		AC_C_MALLINFO
-	fi
-fi
-
-
 # -----------------------------------------------------------------------------
 # libm
 
 AC_ARG_VAR([MATH_CFLAGS], [C compiler flags for math])
 AC_ARG_VAR([MATH_LIBS], [linker flags for math])
 if test -z "${MATH_LIBS}"; then
-	AC_CHECK_LIB(
-		[m],
-		[sin],
-		[MATH_LIBS="-lm"]
-	)
+    AC_CHECK_LIB(
+        [m],
+        [sin],
+        [MATH_LIBS="-lm"]
+    )
 fi
-
-if test "${with_math}" = "yes"; then
-	test -z "${MATH_LIBS}" && AC_MSG_ERROR([math required but not found])
-	AC_DEFINE([STORAGE_WITH_MATH], [1], [math usability])
-	OPTIONAL_MATH_CFLAGS="${MATH_CFLAGS}"
-	OPTIONAL_MATH_LIBS="${MATH_LIBS}"
+test "${with_math}" = "yes" -a -z "${MATH_LIBS}" && AC_MSG_ERROR([math required but not found])
+
+AC_MSG_CHECKING([if libm should be used])
+if test "${with_math}" != "no" -a ! -z "${MATH_LIBS}"; then
+    with_math="yes"
+    AC_DEFINE([STORAGE_WITH_MATH], [1], [math usability])
+    OPTIONAL_MATH_CFLAGS="${MATH_CFLAGS}"
+    OPTIONAL_MATH_LIBS="${MATH_LIBS}"
+else
+    with_math="no"
 fi
+AC_MSG_RESULT([${with_math}])
 
 
 # -----------------------------------------------------------------------------
 # zlib
 
 PKG_CHECK_MODULES(
-	[ZLIB],
-	[zlib],
-	[have_zlib=yes],
-	[have_zlib=no]
+    [ZLIB],
+    [zlib],
+    [have_zlib=yes],
+    [have_zlib=no]
 )
 test "${with_zlib}" = "yes" -a "${have_zlib}" != "yes" && AC_MSG_ERROR([zlib required but not found. Try installing 'zlib1g-dev' or 'zlib-devel'.])
-if test "${with_zlib}" = "yes"; then
-	AC_DEFINE([NETDATA_WITH_ZLIB], [1], [zlib usability])
-	OPTIONAL_ZLIB_CLFAGS="${ZLIB_CFLAGS}"
-	OPTIONAL_ZLIB_LIBS="${ZLIB_LIBS}"
+
+AC_MSG_CHECKING([if zlib should be used])
+if test "${with_zlib}" != "no" -a "${have_zlib}" = "yes"; then
+    with_zlib="yes"
+    AC_DEFINE([NETDATA_WITH_ZLIB], [1], [zlib usability])
+    OPTIONAL_ZLIB_CLFAGS="${ZLIB_CFLAGS}"
+    OPTIONAL_ZLIB_LIBS="${ZLIB_LIBS}"
+else
+    with_zlib="no"
 fi
+AC_MSG_RESULT([${with_zlib}])
 
 
 # -----------------------------------------------------------------------------
 # libuuid
 
 PKG_CHECK_MODULES(
-	[UUID],
-	[uuid],
-	[have_uuid=yes],
-	[AC_MSG_ERROR([libuuid required but not found. Try installing 'uuid-dev' or 'libuuid-devel'.])]
+    [UUID],
+    [uuid],
+    [have_uuid=yes],
+    [AC_MSG_ERROR([libuuid required but not found. Try installing 'uuid-dev' or 'libuuid-devel'.])]
 )
 AC_DEFINE([NETDATA_WITH_UUID], [1], [uuid usability])
 OPTIONAL_UUID_CLFAGS="${UUID_CFLAGS}"
 OPTIONAL_UUID_LIBS="${UUID_LIBS}"
 
 
+# -----------------------------------------------------------------------------
+# compiler options
+
+AC_ARG_VAR([SSE_CANDIDATE], [C compiler flags for SSE])
+AS_CASE([$host_cpu],
+    [i?86], [SSE_CANDIDATE="yes"]
+)
+AC_SUBST([SSE_CANDIDATE])
+if test "${SSE_CANDIDATE}" = "yes" -a "${enable_x86_sse}" = "yes"; then
+    opt="-msse2 -mfpmath=sse"
+    AX_CHECK_COMPILE_FLAG(${opt}, [CFLAGS="${CFLAGS} ${opt}"], [])
+fi
+
+if test "${GCC}" = "yes"; then
+    AC_DEFINE_UNQUOTED([likely(x)], [__builtin_expect(!!(x), 1)], [gcc branch optimization])
+    AC_DEFINE_UNQUOTED([unlikely(x)], [__builtin_expect(!!(x), 0)], [gcc branch optimization])
+else
+    AC_DEFINE_UNQUOTED([likely(x)], [(x)], [gcc branch optimization])
+    AC_DEFINE_UNQUOTED([unlikely(x)], [(x)], [gcc branch optimization])
+fi
+
+if test "${enable_pedantic}" = "yes"; then
+    enable_strict="yes"
+    CFLAGS="${CFLAGS} -pedantic -Wall -Wextra -Wno-long-long"
+fi
+
+
+# -----------------------------------------------------------------------------
+# memory allocation library
+
+AC_MSG_CHECKING([for memory allocator])
+TS_CHECK_JEMALLOC
+if test "$has_jemalloc" = "1"; then
+    AC_DEFINE([ENABLE_JEMALLOC], [1], [compile and link with jemalloc])
+    AC_MSG_RESULT([jemalloc])
+else
+    TS_CHECK_TCMALLOC
+    if test "$has_tcmalloc" = "1"; then
+        AC_DEFINE([ENABLE_TCMALLOC], [1], [compile and link with tcmalloc])
+        AC_MSG_RESULT([tcmalloc])
+    else
+        AC_MSG_RESULT([system])
+        AC_C_MALLOPT
+        AC_C_MALLINFO
+    fi
+fi
+
+
 # -----------------------------------------------------------------------------
 # libcap
 
 PKG_CHECK_MODULES(
-	[LIBCAP],
-	[libcap],
-	[have_libcap=yes],
-	[have_libcap=no]
+    [LIBCAP],
+    [libcap],
+    [AC_CHECK_LIB([cap], [cap_get_proc, cap_set_proc],
+        [AC_CHECK_HEADER(
+            [sys/capability.h],
+            [have_libcap=yes],
+            [have_libcap=no]
+        )],
+        [have_libcap=no]
+    )],
+    [have_libcap=no]
 )
 test "${with_libcap}" = "yes" -a "${have_libcap}" != "yes" && AC_MSG_ERROR([libcap required but not found.])
 
 AC_MSG_CHECKING([if libcap should be used])
-if test "${with_libcap}" != "no"; then
-	with_libcap="yes"
-	AC_DEFINE([HAVE_CAPABILITY], [1], [libcap usability])
-	OPTIONAL_LIBCAP_CLFAGS="${LIBCAP_CFLAGS}"
-	OPTIONAL_LIBCAP_LIBS="${LIBCAP_LIBS}"
+if test "${with_libcap}" != "no" -a "${have_libcap}" = "yes"; then
+    with_libcap="yes"
+    AC_DEFINE([HAVE_CAPABILITY], [1], [libcap usability])
+    OPTIONAL_LIBCAP_CLFAGS="${LIBCAP_CFLAGS}"
+    OPTIONAL_LIBCAP_LIBS="${LIBCAP_LIBS}"
 else
-	with_libcap="no"
+    with_libcap="no"
 fi
 AC_MSG_RESULT([${with_libcap}])
 AM_CONDITIONAL([ENABLE_CAPABILITY], [test "${with_libcap}" = "yes"])
@@ -309,22 +339,22 @@ AM_CONDITIONAL([ENABLE_PLUGIN_APPS], [test "${enable_plugin_apps}" = "yes"])
 # freeipmi.plugin - libipmimonitoring
 
 PKG_CHECK_MODULES(
-	[IPMIMONITORING],
-	[libipmimonitoring],
-	[have_ipmimonitoring=yes],
-	[have_ipmimonitoring=no]
+    [IPMIMONITORING],
+    [libipmimonitoring],
+    [have_ipmimonitoring=yes],
+    [have_ipmimonitoring=no]
 )
 test "${enable_plugin_freeipmi}" = "yes" -a "${have_ipmimonitoring}" != "yes" && \
-	AC_MSG_ERROR([ipmimonitoring required but not found. Try installing 'libipmimonitoring-dev' or 'libipmimonitoring-devel'])
+    AC_MSG_ERROR([ipmimonitoring required but not found. Try installing 'libipmimonitoring-dev' or 'libipmimonitoring-devel'])
 
 AC_MSG_CHECKING([if freeipmi.plugin should be enabled])
 if test "${enable_plugin_freeipmi}" != "no" -a "${have_ipmimonitoring}" = "yes"; then
-	enable_plugin_freeipmi="yes"
-	AC_DEFINE([HAVE_FREEIPMI], [1], [ipmimonitoring usability])
-	OPTIONAL_IPMIMONITORING_CLFAGS="${IPMIMONITORING_CFLAGS}"
-	OPTIONAL_IPMIMONITORING_LIBS="${IPMIMONITORING_LIBS}"
+    enable_plugin_freeipmi="yes"
+    AC_DEFINE([HAVE_FREEIPMI], [1], [ipmimonitoring usability])
+    OPTIONAL_IPMIMONITORING_CLFAGS="${IPMIMONITORING_CFLAGS}"
+    OPTIONAL_IPMIMONITORING_LIBS="${IPMIMONITORING_LIBS}"
 else
-	enable_plugin_freeipmi="no"
+    enable_plugin_freeipmi="no"
 fi
 AC_MSG_RESULT([${enable_plugin_freeipmi}])
 AM_CONDITIONAL([ENABLE_PLUGIN_FREEIPMI], [test "${enable_plugin_freeipmi}" = "yes"])
@@ -333,38 +363,71 @@ AM_CONDITIONAL([ENABLE_PLUGIN_FREEIPMI], [test "${enable_plugin_freeipmi}" = "ye
 # -----------------------------------------------------------------------------
 # nfacct.plugin - libmnl, libnetfilter_acct
 
+AC_CHECK_HEADERS_ONCE([linux/netfilter/nfnetlink_conntrack.h])
+
 PKG_CHECK_MODULES(
-	[NFACCT],
-	[libnetfilter_acct],
-	[have_libnetfilter_acct=yes],
-	[have_libnetfilter_acct=no]
+    [NFACCT],
+    [libnetfilter_acct],
+    [have_libnetfilter_acct=yes],
+    [have_libnetfilter_acct=no]
 )
+
 PKG_CHECK_MODULES(
-	[LIBMNL],
-	[libmnl],
-	[have_libmnl=yes],
-	[have_libmnl=no]
+    [LIBMNL],
+    [libmnl],
+    [have_libmnl=yes],
+    [have_libmnl=no]
 )
 
 test "${enable_plugin_nfacct}" = "yes" -a "${have_libnetfilter_acct}" != "yes" && \
-	AC_MSG_ERROR([netfilter_acct required but not found])
+    AC_MSG_ERROR([netfilter_acct required but not found])
 
 test "${enable_plugin_nfacct}" = "yes" -a "${have_libmnl}" != "yes" && \
-	AC_MSG_ERROR([libmnl required but not found. Try installing 'libmnl-dev' or 'libmnl-devel'])
+    AC_MSG_ERROR([libmnl required but not found. Try installing 'libmnl-dev' or 'libmnl-devel'])
 
 AC_MSG_CHECKING([if nfacct.plugin should be enabled])
 if test "${enable_plugin_nfacct}" != "no" -a "${have_libnetfilter_acct}" = "yes" -a "${have_libmnl}" = "yes"; then
-	enable_plugin_nfacct="yes"
-	AC_DEFINE([INTERNAL_PLUGIN_NFACCT], [1], [nfacct plugin usability])
-	OPTIONAL_NFACCT_CLFAGS="${NFACCT_CFLAGS} ${LIBMNL_CFLAGS}"
-	OPTIONAL_NFACCT_LIBS="${NFACCT_LIBS} ${LIBMNL_LIBS}"
+    enable_plugin_nfacct="yes"
+    AC_DEFINE([HAVE_LIBMNL], [1], [libmnl usability])
+    AC_DEFINE([HAVE_LIBNETFILTER_ACCT], [1], [libnetfilter_acct usability])
+    AC_DEFINE([INTERNAL_PLUGIN_NFACCT], [1], [nfacct plugin usability])
+    OPTIONAL_NFACCT_CLFAGS="${NFACCT_CFLAGS} ${LIBMNL_CFLAGS}"
+    OPTIONAL_NFACCT_LIBS="${NFACCT_LIBS} ${LIBMNL_LIBS}"
 else
-	enable_plugin_nfacct="no"
+    enable_plugin_nfacct="no"
 fi
 AC_MSG_RESULT([${enable_plugin_nfacct}])
 AM_CONDITIONAL([ENABLE_PLUGIN_NFACCT], [test "${enable_plugin_nfacct}" = "yes"])
 
 
+# -----------------------------------------------------------------------------
+# Link-Time-Optimization
+
+if test "${enable_lto}" != "no"; then
+    opt="-flto"
+    AX_CHECK_COMPILE_FLAG(${opt}, [have_lto=yes], [have_lto=no])
+fi
+if test "${have_lto}" = "yes"; then
+    oCFLAGS="${CFLAGS}"
+    CFLAGS="${CFLAGS} -flto ${OPTIONAL_MATH_CLFAGS} ${OPTIONAL_NFACCT_CLFAGS} ${OPTIONAL_ZLIB_CLFAGS} ${OPTIONAL_UUID_CLFAGS} ${OPTIONAL_LIBCAP_CFLAGS} ${OPTIONAL_IPMIMONITORING_CFLAGS}"
+    ac_cv_c_lto_cross_compile="${enable_lto}"
+    test "${ac_cv_c_lto_cross_compile}" != "yes" && ac_cv_c_lto_cross_compile="no"
+    AC_C_LTO
+    CFLAGS="${oCFLAGS}"
+    test "${ac_cv_c_lto}" != "yes" && have_lto="no"
+fi
+test "${enable_lto}" = "yes" -a "${have_lto}" != "yes" && \
+    AC_MSG_ERROR([LTO is required but is not available.])
+AC_MSG_CHECKING([if LTO should be enabled])
+if test "${enable_lto}" != "no" -a "${have_lto}" = "yes"; then
+    enable_lto="yes"
+    CFLAGS="${CFLAGS} -flto"
+else
+    enable_lto="no"
+fi
+AC_MSG_RESULT([${enable_lto}])
+
+
 # -----------------------------------------------------------------------------
 
 AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
@@ -394,17 +457,17 @@ AC_SUBST([OPTIONAL_IPMIMONITORING_CFLAGS])
 AC_SUBST([OPTIONAL_IPMIMONITORING_LIBS])
 
 AC_CONFIG_FILES([
-	Makefile
-	charts.d/Makefile
-	conf.d/Makefile
-	netdata.spec
-	python.d/Makefile
-	node.d/Makefile
-	plugins.d/Makefile
-	src/Makefile
-	system/Makefile
-	web/Makefile
-	contrib/Makefile
+    Makefile
+    charts.d/Makefile
+    conf.d/Makefile
+    netdata.spec
+    python.d/Makefile
+    node.d/Makefile
+    plugins.d/Makefile
+    src/Makefile
+    system/Makefile
+    web/Makefile
+    contrib/Makefile
 ])
 AC_OUTPUT