Merge pull request #1743 from rubenk/apcups-coverity

[collectd.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7aff89a..a85d2e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_ifdef([LT_PACKAGE_VERSION],
 
 AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
 
-AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 foreign])
+AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 no-dist-gzip foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_LANG(C)
 
@@ -800,12 +800,14 @@ AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr
 AC_FUNC_STRERROR_R
 
 test_cxx_flags() {
-       AC_LANG_PUSH(C++)
-       AC_LANG_CONFTEST([int main(void){}])
+       AC_LANG_PUSH([C++])
+       AC_LANG_CONFTEST([
+               AC_LANG_SOURCE([[int main(void){}]])
+       ])
        $CXX -c conftest.cpp $CXXFLAGS $@ > /dev/null 2> /dev/null
        ret=$?
        rm -f conftest.o
-       AC_LANG_POP(C++)
+       AC_LANG_POP([C++])
        return $ret
 }