frontend/query: Simplified code a little.

[sysdb.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 31ec8de9e5a17546fd93eaddccbafb51af04e26f..95394ebd839bbd146fe90df994693d348b4c6721 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,11 +33,18 @@ AC_INIT([System DataBase],[m4_esyscmd(./version-gen.sh)],
 PACKAGE_MAINTAINER="Sebastian 'tokkee' Harl <tokkee@sysdb.io>"
 AC_DEFINE_UNQUOTED([PACKAGE_MAINTAINER], ["$PACKAGE_MAINTAINER"],
                [Define to the name of the maintainer of this package.])
+if test "x$PACKAGE_URL" = "x"; then
+       PACKAGE_URL="https://sysdb.io/"
+       AC_DEFINE_UNQUOTED([PACKAGE_URL], ["$PACKAGE_URL"],
+                       [Define to the home page for this package.])
+fi
+
 AC_CONFIG_SRCDIR([src/sysdb.c])
 AC_CONFIG_HEADERS([src/config.h])
 AC_PREFIX_DEFAULT([/opt/sysdb])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_LANG(C)
 
@@ -76,16 +83,16 @@ test_cc_flags() {
        AC_LANG_CONFTEST([int main(void){}])
        $CC -c conftest.c $CFLAGS $STRICT_CFLAGS $@ > /dev/null 2> /dev/null
        ret=$?
-       rm -f conftest.o
+       rm -f conftest.o conftest.c
        return $ret
 }
 
 test_cxx_flags() {
        AC_LANG_PUSH(C++)
        AC_LANG_CONFTEST([int main(void){}])
-       $CXX -c conftest.c $CXXFLAGS $STRICT_CXXFLAGS $@ > /dev/null 2> /dev/null
+       $CXX -c conftest.cpp $CXXFLAGS $STRICT_CXXFLAGS $@ > /dev/null 2> /dev/null
        ret=$?
-       rm -f conftest.o
+       rm -f conftest.o conftest.cpp
        AC_LANG_POP(C++)
        return $ret
 }
@@ -615,7 +622,8 @@ else
 fi; fi
 
 if test "x$have_librrd" = "xyes"; then
-       AC_CHECK_HEADERS([rrd_client.h])
+       AC_CHECK_HEADERS([rrd.h])
+       AC_CHECK_HEADERS([rrd_client.h], [], [], [[#include <rrd.h>]])
 fi
 
 dnl Feature checks.
@@ -679,9 +687,11 @@ AC_SDB_PLUGIN([timeseries-rrdtool], [$rrdtool_default],
                [fetch time-series data from RRD files])
 
 m4_divert_once([HELP_ENABLE], [
-Store writers:])
+Store implementations:])
+AC_SDB_PLUGIN([store-memory], [yes],
+               [store objects in a volatile, in-memory database (read/write)])
 AC_SDB_PLUGIN([store-network], [yes],
-               [send stored objects to a remote instance])
+               [send stored objects to a remote instance (write only)])
 
 m4_divert_once([HELP_ENABLE], [
 Plugins:])
@@ -765,8 +775,9 @@ AC_MSG_RESULT()
 AC_MSG_RESULT([  Time-series fetchers:])
 AC_MSG_RESULT([    rrdtool:  . . . . . . . . . $enable_timeseries_rrdtool])
 AC_MSG_RESULT()
-AC_MSG_RESULT([  Store writers:])
-AC_MSG_RESULT([    network:  . . . . . . . . . $enable_store_network])
+AC_MSG_RESULT([  Store implementations:])
+AC_MSG_RESULT([    memory: . . . . . . . . . . $enable_store_memory])
+AC_MSG_RESULT([    network (writer): . . . . . $enable_store_network])
 AC_MSG_RESULT()
 AC_MSG_RESULT([  Plugins:])
 AC_MSG_RESULT([    cname::dns: . . . . . . . . $enable_cname_dns])