build: rename systemd service and reorg system directory

[netdata.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c8a28297d40b54f6c917cc306ce21f36022a128a..ab1550614fc629698933586d47979bc1403d50f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,13 +5,24 @@ AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [1])
 define([VERSION_MINOR], [0])
-define([VERSION_FIX], [0])
+define([VERSION_FIX], [1])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [_master])
 
+dnl Set to "1" for a first RPM release of a new version
+PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed 's/^_//')"
+
 AC_INIT([netdata], VERSION_NUMBER[]VERSION_SUFFIX)
+
+AM_CONDITIONAL([GIT_TREE], [test -f README.md])
+
+AM_MAINTAINER_MODE([disable])
+if test x"$USE_MAINTAINER_MODE" = xyes; then
+AC_MSG_NOTICE(***************** MAINTAINER MODE *****************)
+PACKAGE_BUILT_DATE=$(date '+%d %b %Y')
+fi
+
 PACKAGE_RPM_VERSION="VERSION_NUMBER"
-PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed 's/^_//')"
 AC_SUBST([PACKAGE_RPM_VERSION])
 AC_SUBST([PACKAGE_RPM_RELEASE])
 
@@ -28,7 +39,7 @@ AC_USE_SYSTEM_EXTENSIONS
 
 AC_ARG_ENABLE(
        [plugin-nfacct],
-       [AS_HELP_STRING([--enable-nfacct], [enable nfacct plugin, requires root])],
+       [AS_HELP_STRING([--enable-plugin-nfacct], [enable nfacct plugin, requires root])],
        ,
        [enable_plugin_nfacct="no"]
 )
@@ -73,18 +84,6 @@ AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_C_INLINE
 
-PKG_CHECK_MODULES(
-       [NFACCT],
-       [libnetfilter_acct],
-)
-PKG_CHECK_MODULES(
-       [LIBMNL],
-       [libmnl],
-)
-PKG_CHECK_MODULES(
-       [ZLIB],
-       [zlib],
-)
 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
@@ -95,8 +94,15 @@ if test -z "${MATH_LIBS}"; then
        )
 fi
 
-test "${enable_daemon}" = "yes" && AC_DEFINE([NETDATA_DAEMON], [1], [daemon settings])
 if test "${enable_plugin_nfacct}" = "yes"; then
+       PKG_CHECK_MODULES(
+               [NFACCT],
+               [libnetfilter_acct],
+       )
+       PKG_CHECK_MODULES(
+               [LIBMNL],
+               [libmnl],
+       )
        test -z "${NFACCT_LIBS}" && AC_MSG_ERROR([netfilter_acct required but not found])
        test -z "${LIBMNL_LIBS}" && AC_MSG_ERROR([libmnl required but not found])
        AC_DEFINE([INTERNAL_PLUGIN_NFACCT], [1], [nfacct plugin settings])
@@ -104,6 +110,10 @@ if test "${enable_plugin_nfacct}" = "yes"; then
        OPTIONAL_NFACCT_LIBS="${NFACCT_LIBS} ${LIBMNL_LIBS}"
 fi
 if test "${with_zlib}" = "yes"; then
+       PKG_CHECK_MODULES(
+               [ZLIB],
+               [zlib],
+       )
        test -z "${ZLIB_LIBS}" && AC_MSG_ERROR([zlib required but not found])
        AC_DEFINE([NETDATA_WITH_ZLIB], [1], [zlib settings])
        OPTIONAL_ZLIB_CLFAGS="${ZLIB_CFLAGS}"
@@ -133,6 +143,7 @@ AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop priv
 
 AC_SUBST([cachedir], ["\$(localstatedir)/cache/netdata"])
 AC_SUBST([chartsdir], ["\$(libexecdir)/netdata/charts.d"])
+AC_SUBST([nodedir], ["\$(libexecdir)/netdata/node.d"])
 AC_SUBST([configdir], ["\$(sysconfdir)/netdata"])
 AC_SUBST([logdir], ["\$(localstatedir)/log/netdata"])
 AC_SUBST([pluginsdir], ["\$(libexecdir)/netdata/plugins.d"])
@@ -150,11 +161,13 @@ AC_CONFIG_FILES([
        charts.d/Makefile
        conf.d/Makefile
        netdata.spec
+       node.d/Makefile
        plugins.d/Makefile
        src/Makefile
+       system/Makefile
        web/Makefile
 ])
 AC_OUTPUT
 
-test "${with_math}" != "yes" && AC_MSG_WARN([You are building without math. math allows accurate calculations. It should be enabled.])
-test "${with_zlib}" != "yes" && AC_MSG_WARN([You are building without zlib. zlib allows netdata to trasnfer a lot less data with web clients. It should be enabled.])
+test "${with_math}" != "yes" && AC_MSG_WARN([You are building without math. math allows accurate calculations. It should be enabled.]) || :
+test "${with_zlib}" != "yes" && AC_MSG_WARN([You are building without zlib. zlib allows netdata to trasnfer a lot less data with web clients. It should be enabled.]) || :