diff --git a/configure.ac b/configure.ac
index 2bcd7248a60786a751fc1227b273c16771123fdf..088a4b59fc994ad313dbd9540b1fc70901808b6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_INIT([System DataBase],[m4_esyscmd(./version-gen.sh)],
[sysdb@sysdb.io],
[sysdb],
- [http://sysdb.io/])
+ [https://sysdb.io/])
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.])
AC_SYS_LARGEFILE
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
)
test_cc_flags() {
- AC_LANG_CONFTEST([AC_LANG_PROGRAM([[ ]], [[ ]])])
- $CC -c conftest.c $CFLAGS $@ > /dev/null 2> /dev/null
+ AC_LANG_CONFTEST([int main(void){}])
+ $CC -c conftest.c $CFLAGS $STRICT_CFLAGS $@ > /dev/null 2> /dev/null
ret=$?
rm -f conftest.o
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
+ ret=$?
+ rm -f conftest.o
+ AC_LANG_POP(C++)
+ return $ret
+}
+
STRICT_CFLAGS=""
+STRICT_CXXFLAGS=""
m4_divert_once([HELP_ENABLE], [
Build options:])
done
fi
+dnl We need C++11 for facter.
+AC_MSG_CHECKING([whether $CXX accepts -std=c++11])
+if test_cxx_flags -std=c++11; then
+ CXXFLAGS="$CXXFLAGS -std=c++11"
+ AC_MSG_RESULT([yes])
+else
+ # Oh well, the header check will determine if it works anyway.
+ AC_MSG_RESULT([no])
+fi
+
dnl Hardening (see e.g. http://wiki.debian.org/Hardening for a motivation).
AC_DEFINE([_FORTIFY_SOURCE], 2,
[Define to enable protection against static sized buffer overflows.])
[enable_hardening="yes"])
if test "x$enable_hardening" = "xyes"; then
- hardening=0
+ hardening_cc=0
+ hardening_cxx=0
hardening_tests=0
for flag in -Wformat -Wformat-security; do
hardening_tests=$(($hardening_tests + 1))
- AC_MSG_CHECKING([whether $CC accepts $flag])
+ AC_MSG_CHECKING([whether $CC accepts $flag])
if test_cc_flags $flag; then
STRICT_CFLAGS="$STRICT_CFLAGS $flag"
- hardening=$(($hardening + 1))
+ hardening_cc=$(($hardening_cc + 1))
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+
+ AC_MSG_CHECKING([whether $CXX accepts $flag])
+ if test_cxx_flags $flag; then
+ STRICT_CXXFLAGS="$STRICT_CXXFLAGS $flag"
+ hardening_cxx=$(($hardening_cxx + 1))
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
done
- if test $hardening -ne $hardening_tests; then
+ if test $hardening_cc -ne $hardening_tests; then
AC_MSG_WARN(
- [Some hardening options are not supported by your compiler!])
+ [Some hardening options are not supported by your C compiler!])
+ fi
+ if test $hardening_cxx -ne $hardening_tests; then
+ AC_MSG_WARN(
+ [Some hardening options are not supported by your C++ compiler!])
fi
fi
for flag in -Wall -Werror; do
AC_MSG_CHECKING([whether $CC accepts $flag])
-
if test_cc_flags $flag; then
STRICT_CFLAGS="$STRICT_CFLAGS $flag"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
+
+ AC_MSG_CHECKING([whether $CXX accepts $flag])
+ if test_cxx_flags $flag; then
+ STRICT_CXXFLAGS="$STRICT_CXXFLAGS $flag"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
done
if test "x$enable_strict_checks" = "xyes"; then
-Wshadow \
-Wstrict-prototypes; do
AC_MSG_CHECKING([whether $CC accepts $flag])
-
if test_cc_flags $flag; then
STRICT_CFLAGS="$STRICT_CFLAGS $flag"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
+
+ dnl -Wshadow produces unnecessary warnings/errors in case a
+ dnl C function name "shadows" a struct constructor.
+ if test "x$flag" != "x-Wshadow"; then
+ AC_MSG_CHECKING([whether $CXX accepts $flag])
+ if test_cxx_flags $flag; then
+ STRICT_CXXFLAGS="$STRICT_CXXFLAGS $flag"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
done
fi
AC_SUBST([STRICT_CFLAGS])
+AC_SUBST([STRICT_CXXFLAGS])
AC_ARG_ENABLE([gcov],
AS_HELP_STRING([--enable-gcov],
AC_SUBST([READLINE_CFLAGS])
AM_CONDITIONAL([BUILD_CLIENT], test "x$readline_support" != "no")
+AC_LANG_PUSH(C++)
+AC_ARG_WITH([libfacter],
+ [AS_HELP_STRING([--with-libfacter], [libfacter support (default: auto)])],
+ [with_libfacter="$withval"],
+ [with_libfacter="yes"])
+if test "x$with_libfacter" = "xyes" || test "x$with_libfacter" = "xauto"; then
+ AC_CHECK_HEADERS([facter/facts/collection.hpp],
+ [have_libfacter="yes"],
+ [have_libfacter="no (facter/facts/collection.hpp not found)"])
+else if test "x$with_libfacter" = "xno"; then
+ have_libfacter="$with_libfacter (disabled on command-line)"
+else
+ AC_MSG_ERROR([Invalid value for option --with-libfacter=$with_libfacter (expected "yes", "no", or "auto")])
+fi; fi
+if test "x$have_libfacter" = "xyes"; then
+ AC_MSG_CHECKING([for facter::facts::collection in -lfacter])
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[[ #include <facter/facts/collection.hpp> ]]],
+ [[[
+ facter::facts::collection facts;
+ facts.add_default_facts();
+ ]]]
+ )],
+ [TEST_LIBS=$TEST_LIBS -lfacter],
+ [have_libfacter="yes"],
+ [have_libfacter="no (libfacter not found)"])
+ AC_MSG_RESULT([$have_libfacter])
+fi
+AC_LANG_POP(C++)
+
AC_ARG_WITH([librrd],
[AS_HELP_STRING([--with-librrd], [librrd support (default: auto)])],
[with_librrd="$withval"],
AM_CONDITIONAL([INTEGRATION_TESTING], test "x$integration_tests" = "xyes")
dnl Plugin checks.
+facter_default=$have_libfacter
+if test "x$facter_default" != "xyes"; then
+ facter_default="no (requires libfacter)"
+fi
puppet_storeconfigs_default=$with_libdbi
if test "x$puppet_storeconfigs_default" != "xyes"; then
puppet_storeconfigs_default="no (requires libdbi)"
AC_SDB_PLUGIN_INIT
AC_SDB_PLUGIN([collectd-unixsock], [yes],
[backend accessing the system statistics collection daemon])
+AC_SDB_PLUGIN([facter], [$facter_default],
+ [backend retrieving local facter facts])
AC_SDB_PLUGIN([mk-livestatus], [yes],
[backend accessing Nagios/Icinga/Shinken using MK Livestatus])
AC_SDB_PLUGIN([puppet-storeconfigs], [$puppet_storeconfigs_default],
AC_MSG_RESULT()
AC_MSG_RESULT([ Backends:])
AC_MSG_RESULT([ collectd::unixsock: . . . . $enable_collectd_unixsock])
+AC_MSG_RESULT([ facter . . . . . . . . . . $enable_facter])
AC_MSG_RESULT([ mk-livestatus: . . . . . . $enable_mk_livestatus])
AC_MSG_RESULT([ puppet::storeconfigs: . . . $enable_puppet_storeconfigs])
AC_MSG_RESULT()