From: Bruno Haible Date: Mon, 17 Aug 2020 08:39:03 +0000 (+0200) Subject: uchar C++ tests: Fix build error on FreeBSD 12. X-Git-Tag: v1.0~3715 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=bc0db891bd4d22a02395e637ce938a3add25e59d;p=gnulib.git uchar C++ tests: Fix build error on FreeBSD 12. * modules/uchar-c++-tests (configure.ac): Test whether exists. (Makefile.am): Don't include test-uchar-c++2.cc in the compilation if does not exist. --- diff --git a/ChangeLog b/ChangeLog index 8d72748ba1..6a053a2cca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-08-17 Bruno Haible + + uchar C++ tests: Fix build error on FreeBSD 12. + * modules/uchar-c++-tests (configure.ac): Test whether exists. + (Makefile.am): Don't include test-uchar-c++2.cc in the compilation if + does not exist. + 2020-08-16 Paul Eggert time_rz: remove unused functions diff --git a/modules/uchar-c++-tests b/modules/uchar-c++-tests index 4f179f05a0..2cbc3312b5 100644 --- a/modules/uchar-c++-tests +++ b/modules/uchar-c++-tests @@ -10,11 +10,34 @@ 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 header file from C++11. + AC_CACHE_CHECK([whether the C++ compiler has ], + [gl_cv_cxxheader_cuchar], + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[]]) + ], + [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 test-uchar-c++2.cc +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