X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=4816c751551284aca8761f0444971202174eb587;hb=6f8642c6df35a876f2f0bce3557886d45ac41a7a;hp=beb30c282edce273d409af71a2044d12b58ec016;hpb=f4366504b9fef13f15f53b029c90e810cbc44e2d;p=collectd.git

diff --git a/configure.ac b/configure.ac
index beb30c28..4816c751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,6 @@ AC_PROG_LEX
 AC_PROG_YACC
 
 AC_PATH_PROG([VALGRIND], [valgrind])
-AC_SUBST([VALGRIND])
 
 # Warn when pkg.m4 is missing
 m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
@@ -89,11 +88,9 @@ if test "x$PROTOC" != "x"; then
 	fi
 	AC_MSG_RESULT([$protoc3])
 fi
-AC_SUBST([PROTOC])
 AM_CONDITIONAL(HAVE_PROTOC3, test "x$have_protoc3" = "xyes")
 
 AC_PATH_PROG([GRPC_CPP_PLUGIN], [grpc_cpp_plugin])
-AC_SUBST([GRPC_CPP_PLUGIN])
 AM_CONDITIONAL(HAVE_GRPC_CPP, test "x$GRPC_CPP_PLUGIN" != "x")
 
 AC_CHECK_PROG([have_protoc_c], [protoc-c], [yes], [no])
@@ -803,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
 }
 
@@ -6202,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])