summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Reser <ben@reser.org>2013-03-19 21:19:05 +0100
committerDave Cottlehuber <dch@apache.org>2013-03-20 15:07:28 +0100
commitd9e3c58b930315189a4141891bd49d5d212c1059 (patch)
treeb5e0b072adb8887e39e1dfedfb7d695b0c0ee0ad
parent4e3d67456c60e456bcb267e765e7df7d3429913c (diff)
downloadcouchdb-d9e3c58b930315189a4141891bd49d5d212c1059.tar.gz
COUCHDB-1699: configure: C++ compiler detection improvement
- amended patch to resolve detection failures on Windows, OSX, and gentoo
-rw-r--r--configure.ac9
1 files changed, 2 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 904252841..91e2d3d2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,14 +44,9 @@ m4_define([snappy_minor], [0])
m4_define([snappy_patchlevel], [3])
AC_PROG_CXX
-AC_MSG_CHECKING([that we found a C++ compiler])
-if test -n "$ac_ct_CXX" ; then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([A C++ compiler is required.])
-fi
AC_LANG([C++])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],,
+ AC_MSG_ERROR([A C++ compiler is required.]))
AC_C_BIGENDIAN
AC_CHECK_HEADERS([stdint.h stddef.h sys/mman.h sys/resource.h])
AC_CHECK_FUNC([mmap])