diff --git a/configure.ac b/configure.ac
index beb30c282edce273d409af71a2044d12b58ec016..eb5d17b5bbb31f9f1f4b82b0346a827686417eeb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
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])
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
}