From 09963c23cb67994caea0ec00804509ebdc1e3d60 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 31 Jul 2010 23:49:29 +0200 Subject: [PATCH] Use new ansi-c++.m4 from gnulib. --- ChangeLog | 7 ++++ autogen.sh | 2 ++ gettext-runtime/ChangeLog | 6 ++++ gettext-runtime/configure.ac | 4 +-- gettext-runtime/m4/ChangeLog | 7 ++++ gettext-runtime/m4/Makefile.am | 1 - gettext-runtime/m4/ansi-c++.m4 | 62 ---------------------------------- gettext-tools/ChangeLog | 6 ++++ gettext-tools/configure.ac | 2 +- 9 files changed, 31 insertions(+), 66 deletions(-) delete mode 100644 gettext-runtime/m4/ansi-c++.m4 diff --git a/ChangeLog b/ChangeLog index cb91a597b..fac7e34d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-07-31 Bruno Haible + + Use new ansi-c++.m4 from gnulib. + * autogen.sh (GNULIB_MODULES_RUNTIME_OTHER, GNULIB_MODULES_TOOLS_OTHER): + Add ansi-c++-opt. + Reported at . + 2010-06-06 Bruno Haible New options --with-xz and --with-bzip2 for compressing the archive. diff --git a/autogen.sh b/autogen.sh index 85bdbea3d..b8e6b7183 100755 --- a/autogen.sh +++ b/autogen.sh @@ -98,6 +98,7 @@ if ! $skip_gnulib; then ' GNULIB_MODULES_RUNTIME_OTHER=' gettext-runtime-misc + ansi-c++-opt csharpcomp-script java javacomp-script @@ -241,6 +242,7 @@ if ! $skip_gnulib; then ' GNULIB_MODULES_TOOLS_OTHER=' gettext-tools-misc + ansi-c++-opt csharpcomp-script csharpexec-script gcj diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 9118fe689..94836cc59 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,9 @@ +2010-07-31 Bruno Haible + + Use new ansi-c++.m4 from gnulib. + * configure.ac: Invoke gl_PROG_ANSI_CXX instead of gt_PROG_ANSI_CXX. + Reported at . + 2010-06-04 Bruno Haible * gettext-0.18.1 released. diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index df3584bed..99c80bab6 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the gettext-runtime directory of GNU gettext -dnl Copyright (C) 1995-1999, 2000-2009 Free Software Foundation, Inc. +dnl Copyright (C) 1995-1999, 2000-2010 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -115,7 +115,7 @@ CROSS_COMPILING=$cross_compiling AC_SUBST([CROSS_COMPILING]) dnl Checks for optional programs for the tests/lang-* tests. -gt_PROG_ANSI_CXX +gl_PROG_ANSI_CXX([CXX], [ANSICXX]) dnl Checks for special libraries for the tests/test-lock test. dnl On some systems, sched_yield is in librt, rather than in libpthread. diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 982cdcb99..456825d35 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,10 @@ +2010-07-31 Bruno Haible + + Use new ansi-c++.m4 from gnulib. + * ansi-c++.m4: Remove file. + * Makefile.am (EXTRA_DIST): Remove it. + Reported at . + 2010-07-31 Bruno Haible iconv: Work around AIX 6.1..7.1 bug. diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am index 7eccc6452..bf10c67b2 100644 --- a/gettext-runtime/m4/Makefile.am +++ b/gettext-runtime/m4/Makefile.am @@ -3,7 +3,6 @@ # Generate this list with # find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012' EXTRA_DIST = README \ -ansi-c++.m4 \ codeset.m4 \ fcntl-o.m4 \ gettext.m4 \ diff --git a/gettext-runtime/m4/ansi-c++.m4 b/gettext-runtime/m4/ansi-c++.m4 deleted file mode 100644 index 9056160e7..000000000 --- a/gettext-runtime/m4/ansi-c++.m4 +++ /dev/null @@ -1,62 +0,0 @@ -# ansi-c++.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -# Sets CXX to the name of a sufficiently ANSI C++ compliant compiler, -# or to ":" if none is found. - -AC_DEFUN([gt_PROG_ANSI_CXX], -[ -AC_CHECK_PROGS(CXX, $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC, :) -if test "$CXX" != ":"; then - dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit - dnl upon failure. - AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works]) - AC_LANG_PUSH(C++) - AC_ARG_VAR([CXX], [C++ compiler command]) - AC_ARG_VAR([CXXFLAGS], [C++ compiler flags]) - echo 'int main () { return 0; }' > conftest.$ac_ext - if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - ac_cv_prog_cxx_works=yes - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cxx_cross=no - else - ac_cv_prog_cxx_cross=yes - fi - else - ac_cv_prog_cxx_works=no - fi - rm -fr conftest* - AC_LANG_POP(C++) - AC_MSG_RESULT($ac_cv_prog_cxx_works) - if test $ac_cv_prog_cxx_works = no; then - CXX=: - else - dnl Test for namespaces. Both libasprintf and tests/lang-c++ need it. - dnl We don't bother supporting pre-ANSI-C++ compilers. - AC_MSG_CHECKING([whether the C++ compiler supports namespaces]) - AC_LANG_PUSH(C++) - cat < conftest.$ac_ext -#include -namespace test { using namespace std; } -std::ostream* ptr; -int main () { return 0; } -EOF - if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - gt_cv_prog_cxx_namespaces=yes - else - gt_cv_prog_cxx_namespaces=no - fi - rm -fr conftest* - AC_LANG_POP(C++) - AC_MSG_RESULT($gt_cv_prog_cxx_namespaces) - if test $gt_cv_prog_cxx_namespaces = no; then - CXX=: - fi - fi -fi -]) diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index f31bab1ae..f65195715 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,9 @@ +2010-07-31 Bruno Haible + + Use new ansi-c++.m4 from gnulib. + * configure.ac: Invoke gl_PROG_ANSI_CXX instead of gt_PROG_ANSI_CXX. + Reported at . + 2010-06-06 Bruno Haible New options --with-xz and --with-bzip2 for compressing the archive. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 4a76c1d83..157f2e28d 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -447,7 +447,7 @@ CROSS_COMPILING=$cross_compiling AC_SUBST([CROSS_COMPILING]) dnl Checks for optional programs for the tests/lang-*, tests/recode-* tests. -gt_PROG_ANSI_CXX +gl_PROG_ANSI_CXX([CXX], [ANSICXX]) gt_LOCALE_FR gt_LOCALE_FR_UTF8 gt_LOCALE_JA -- 2.47.2