Hash :
a0654cff
Author :
Date :
2020-12-07T14:05:09
Correct interaction between gl_ANSI_CXX and AC_PROG_CXX. Suggested by Zack Weinberg in <https://savannah.gnu.org/support/?110294>. * m4/ansi-c++.m4 (gl_ANSI_CXX): Mark AC_PROG_CXX as provided. * modules/uchar-c++-tests: Revert the workaround from 2020-08-18.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
Files:
tests/test-uchar-c++.cc
tests/test-uchar-c++2.cc
tests/signature.h
Status:
c++-test
Depends-on:
ansi-c++-opt
configure.ac:
AC_REQUIRE([gl_ANSI_CXX])
if test "$CXX" != no; then
dnl On FreeBSD 12, 'c++' defines __cplusplus to 201402, although it does not
dnl have the <cuchar> header file from C++11.
AC_CACHE_CHECK([whether the C++ compiler has <cuchar>],
[gl_cv_cxxheader_cuchar],
[AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <cuchar>]],
[[]])
],
[gl_cv_cxxheader_cuchar=yes],
[gl_cv_cxxheader_cuchar=no])
AC_LANG_POP([C++])
])
else
gl_cv_cxxheader_cuchar=no
fi
AM_CONDITIONAL([CXX_HAVE_CUCHAR], [test $gl_cv_cxxheader_cuchar != no])
Makefile.am:
if ANSICXX
TESTS += test-uchar-c++
check_PROGRAMS += test-uchar-c++
test_uchar_c___SOURCES = test-uchar-c++.cc
if CXX_HAVE_CUCHAR
test_uchar_c___SOURCES += test-uchar-c++2.cc
endif
test_uchar_c___LDADD = $(LDADD) $(LIB_MBRTOWC)
endif