diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2021-04-26 19:19:59 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2021-04-26 22:32:52 +0100 |
| commit | f14c7120014d6d5a5794206110cdffb457306238 (patch) | |
| tree | b39bd4200275b401e3bc8d42ba0ce49509cfd009 | |
| parent | 13158bda9a1da399d10bf0761749a2cf448d9589 (diff) | |
| download | swig-f14c7120014d6d5a5794206110cdffb457306238.tar.gz | |
Correct disabling of c++11 testing
C++11 testing was not being turned off when the
C++ compiler check for C++11 features failed and
'configure --enable-cpp11-testing' was used
| -rw-r--r-- | Examples/test-suite/common.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 1e59f6dca..5a44980cc 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -677,7 +677,7 @@ ifndef SKIP_CPP_STD_CASES CPP_TEST_CASES += ${CPP_STD_TEST_CASES} endif -ifneq (,$(HAVE_CXX11)) +ifeq (1,$(HAVE_CXX11)) CPP_TEST_CASES += $(CPP11_TEST_CASES) endif diff --git a/configure.ac b/configure.ac index fe53f7d40..180515dfe 100644 --- a/configure.ac +++ b/configure.ac @@ -345,6 +345,7 @@ if test x"$enable_cpp11_testing" = xyes; then CXX=$CXX_SAVED CXXCPP=$CXXCPP_SAVED fi +AC_SUBST(HAVE_CXX11) # On darwin 10.7,10.8,10.9 using clang++, need to ensure using # libc++ for tests and examples to run under mono. May affect @@ -401,7 +402,6 @@ AC_SUBST(TRYLINKINGWITHCXX) AC_SUBST(RPATH) AC_SUBST(PLATCFLAGS) AC_SUBST(PLATCXXFLAGS) -AC_SUBST(HAVE_CXX11) AC_SUBST(LINKFORSHARED) # This variation is needed on OS-X because there is no (apparent) consistency in shared library naming. |