Clean up after checking compiler flags and fix C++ tests.

[sysdb.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 897112ef97192f7ffa847b3fc7b4ad2c842ecd8e..95394ebd839bbd146fe90df994693d348b4c6721 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ 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)
 
@@ -82,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
 }
@@ -621,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.