Use new ansi-c++.m4 from gnulib.

This commit is contained in:
Bruno Haible 2010-07-31 23:49:29 +02:00
parent 9c56832fc9
commit 09963c23cb
9 changed files with 31 additions and 66 deletions

View File

@ -1,3 +1,10 @@
2010-07-31 Bruno Haible <bruno@clisp.org>
Use new ansi-c++.m4 from gnulib.
* autogen.sh (GNULIB_MODULES_RUNTIME_OTHER, GNULIB_MODULES_TOOLS_OTHER):
Add ansi-c++-opt.
Reported at <https://savannah.gnu.org/bugs/?30607>.
2010-06-06 Bruno Haible <bruno@clisp.org>
New options --with-xz and --with-bzip2 for compressing the archive.

View File

@ -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

View File

@ -1,3 +1,9 @@
2010-07-31 Bruno Haible <bruno@clisp.org>
Use new ansi-c++.m4 from gnulib.
* configure.ac: Invoke gl_PROG_ANSI_CXX instead of gt_PROG_ANSI_CXX.
Reported at <https://savannah.gnu.org/bugs/?30607>.
2010-06-04 Bruno Haible <bruno@clisp.org>
* gettext-0.18.1 released.

View File

@ -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.

View File

@ -1,3 +1,10 @@
2010-07-31 Bruno Haible <bruno@clisp.org>
Use new ansi-c++.m4 from gnulib.
* ansi-c++.m4: Remove file.
* Makefile.am (EXTRA_DIST): Remove it.
Reported at <https://savannah.gnu.org/bugs/?30607>.
2010-07-31 Bruno Haible <bruno@clisp.org>
iconv: Work around AIX 6.1..7.1 bug.

View File

@ -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 \

View File

@ -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 <<EOF > conftest.$ac_ext
#include <iostream>
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
])

View File

@ -1,3 +1,9 @@
2010-07-31 Bruno Haible <bruno@clisp.org>
Use new ansi-c++.m4 from gnulib.
* configure.ac: Invoke gl_PROG_ANSI_CXX instead of gt_PROG_ANSI_CXX.
Reported at <https://savannah.gnu.org/bugs/?30607>.
2010-06-06 Bruno Haible <bruno@clisp.org>
New options --with-xz and --with-bzip2 for compressing the archive.

View File

@ -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