X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=a85d2e1775ef8dd03ee93b57a0e7095af0d92e15;hb=62bff38f8315bb5123dc7a928495fc3427a87854;hp=5ab5f0d78b4a7a508f1fadaef4cb4c7f3634fbc8;hpb=e1ca5cecc3cbcaa5431fab3f34c9334efd6046f7;p=collectd.git

diff --git a/configure.ac b/configure.ac
index 5ab5f0d7..a85d2e17 100644
--- 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
 }
 
@@ -6199,7 +6201,7 @@ AM_CXXFLAGS="-Wall"
 if test "x$enable_werror" != "xno"
 then
         AM_CFLAGS="$AM_CFLAGS -Werror"
-        AM_CXXFLAGS="$AM_CFLAGS -Werror"
+        AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
 fi
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_CXXFLAGS])