summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico M. Crisostomo <enrico.m.crisostomo@gmail.com>2014-09-14 00:04:30 +0200
committerPeter Simons <simons@cryp.to>2014-09-14 00:04:30 +0200
commit73663092747032cbbc1740bc4f6597574e993bc1 (patch)
treea024a662f0b389539ae2283caab9f6641ec6fd84
parent2d37ad3d2d3863f2b080ab6a537c73e52bfc5555 (diff)
downloadautoconf-archive-73663092747032cbbc1740bc4f6597574e993bc1.tar.gz
AX_CXX_HAVE_MEM_FN: remove dependency on AX_CXX_NAMESPACES
-rw-r--r--NEWS4
-rw-r--r--m4/ax_cxx_have_mem_fn.m414
2 files changed, 7 insertions, 11 deletions
diff --git a/NEWS b/NEWS
index 2b2548b..bf52fce 100644
--- a/NEWS
+++ b/NEWS
@@ -25,8 +25,8 @@
AX_CXX_HAVE_REFERENCE_WRAPPER, AX_CXX_HAVE_BAD_FUNCTION_CALL,
AX_CXX_HAVE_BIND, AX_CXX_HAVE_BIT_AND, AX_CXX_HAVE_BIT_OR,
AX_CXX_HAVE_BIT_XOR, AX_CXX_HAVE_CREF, AX_CXX_HAVE_FUNCTION,
- AX_CXX_HAVE_HASH, AX_CXX_HAVE_IS_BIND_EXPRESSION, AX_CXX_HAVE_IS_PLACEHOLDER:
- remove dependency on AX_CXX_NAMESPACES.
+ AX_CXX_HAVE_HASH, AX_CXX_HAVE_IS_BIND_EXPRESSION, AX_CXX_HAVE_IS_PLACEHOLDER,
+ AX_CXX_HAVE_MEM_FN: remove dependency on AX_CXX_NAMESPACES.
AX_PROG_FLEX has been extended to support OpenBSD.
diff --git a/m4/ax_cxx_have_mem_fn.m4 b/m4/ax_cxx_have_mem_fn.m4
index febc69b..a4abca6 100644
--- a/m4/ax_cxx_have_mem_fn.m4
+++ b/m4/ax_cxx_have_mem_fn.m4
@@ -8,14 +8,12 @@
#
# DESCRIPTION
#
-# This macros checks if std::mem_fn, added in C++11, is defined in the
+# This macro checks if std::mem_fn, added in C++11, is defined in the
# <functional> header.
#
# If it is, define the ax_cv_cxx_have_mem_fn environment variable to "yes"
# and define HAVE_CXX_MEM_FN.
#
-# NOTE: This macros depends on AX_CXX_NAMESPACES.
-#
# LICENSE
#
# Copyright (c) 2014 Enrico M. Crisostomo <enrico.m.crisostomo@gmail.com>
@@ -25,20 +23,18 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 1
+#serial 2
AC_DEFUN([AX_CXX_HAVE_MEM_FN],
[AC_CACHE_CHECK(
[for std::mem_fn in functional],
ax_cv_cxx_have_mem_fn,
- [AC_REQUIRE([AX_CXX_NAMESPACES])
+ [dnl
AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[
- [#include <functional>
- #ifdef HAVE_NAMESPACES
- using namespace std;
- #endif]
+ [#include <functional>]
+ [using namespace std;]
[struct st { int x; int fn() { return x; } };]
],
[