X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=2f82979a84237a5cd17c2fa99fa4d3dd51c62904;hb=39c196708756fc8f85bfc70c931836479be3b9c2;hp=ed32a935dab3d741f042fbe106d620fca8d42a54;hpb=213fda34b5c2971c370efdc236054a34ab2f0ab4;p=netdata.git

diff --git a/configure.ac b/configure.ac
index ed32a935..2f82979a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,14 +4,23 @@
 AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [1])
-define([VERSION_MINOR], [0])
+define([VERSION_MINOR], [1])
 define([VERSION_FIX], [0])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
-define([VERSION_SUFFIX], [_master])
+define([VERSION_SUFFIX], [])
+
+dnl Set to "1" for a first RPM release of a new version
+PACKAGE_RPM_RELEASE="1"
 
 AC_INIT([netdata], VERSION_NUMBER[]VERSION_SUFFIX)
+
+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 +37,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 +82,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 +92,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 +108,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 +141,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,8 +159,14 @@ AC_CONFIG_FILES([
 	charts.d/Makefile
 	conf.d/Makefile
 	netdata.spec
+	node.d/Makefile
 	plugins.d/Makefile
 	src/Makefile
+	system/Makefile
 	web/Makefile
+	contrib/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.]) || :