enable checking for usable libcap and sys/capability.h

diff --git a/configure.ac b/configure.ac
index 6e86a084862c85e0e0dc543c2c8f13060958a0a7..5b187ca9d4afae70199bc267b1338e16bb4e9a3e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,58 +48,58 @@ 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], [freeipmi plugin, requires root])],
+    ,
+    [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"]
 )
 
 
@@ -147,15 +147,15 @@ AC_CHECK_HEADERS_ONCE([sys/prctl.h])
 
 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"])
@@ -168,25 +168,25 @@ AM_CONDITIONAL([LINUX], [test "${build_target}" = "linux"])
 
 AC_ARG_VAR([SSE_CANDIDATE], [C compiler flags for SSE])
 AS_CASE([$host_cpu],
-       [i?86], [SSE_CANDIDATE="yes"]
+    [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"], [])
+    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])
+    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])
+    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"
+    enable_strict="yes"
+    CFLAGS="${CFLAGS} -pedantic -Wall -Wextra -Wno-long-long"
 fi
 
 
@@ -205,18 +205,18 @@ CC="${PTHREAD_CC}"
 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])
+    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
+    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
 
 
@@ -226,22 +226,22 @@ fi
 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
 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"; then
-       with_math="yes"
-       AC_DEFINE([STORAGE_WITH_MATH], [1], [math usability])
-       OPTIONAL_MATH_CFLAGS="${MATH_CFLAGS}"
-       OPTIONAL_MATH_LIBS="${MATH_LIBS}"
+    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"
+    with_math="no"
 fi
 AC_MSG_RESULT([${with_math}])
 
@@ -250,21 +250,21 @@ 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'.])
 
 AC_MSG_CHECKING([if zlib should be used])
 if test "${with_zlib}" != "no"; then
-       with_zlib="yes"
-       AC_DEFINE([NETDATA_WITH_ZLIB], [1], [zlib usability])
-       OPTIONAL_ZLIB_CLFAGS="${ZLIB_CFLAGS}"
-       OPTIONAL_ZLIB_LIBS="${ZLIB_LIBS}"
+    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"
+    with_zlib="no"
 fi
 AC_MSG_RESULT([${with_zlib}])
 
@@ -273,10 +273,10 @@ 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}"
@@ -287,21 +287,28 @@ OPTIONAL_UUID_LIBS="${UUID_LIBS}"
 # 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}"
+    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"])
@@ -312,9 +319,9 @@ AM_CONDITIONAL([ENABLE_CAPABILITY], [test "${with_libcap}" = "yes"])
 
 AC_MSG_CHECKING([if apps.plugin should be enabled])
 if test "${build_target}" != "macos"; then
-       enable_plugin_apps="yes"
+    enable_plugin_apps="yes"
 else
-       enable_plugin_apps="no"
+    enable_plugin_apps="no"
 fi
 AC_MSG_RESULT([${enable_plugin_apps}])
 AM_CONDITIONAL([ENABLE_PLUGIN_APPS], [test "${enable_plugin_apps}" = "yes"])
@@ -324,22 +331,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"])
@@ -349,32 +356,32 @@ AM_CONDITIONAL([ENABLE_PLUGIN_FREEIPMI], [test "${enable_plugin_freeipmi}" = "ye
 # nfacct.plugin - libmnl, libnetfilter_acct
 
 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([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"])
@@ -409,17 +416,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