]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
projects / thirdparty / gettext.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c56832)
Use new ansi-c++.m4 from gnulib.
authorBruno Haible <bruno@clisp.org>
Sat, 31 Jul 2010 21:49:29 +0000 (23:49 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 30 Aug 2010 20:58:34 +0000 (22:58 +0200)
ChangeLog patch | blob | blame | history
autogen.sh patch | blob | blame | history
gettext-runtime/ChangeLog patch | blob | blame | history
gettext-runtime/configure.ac patch | blob | blame | history
gettext-runtime/m4/ChangeLog patch | blob | blame | history
gettext-runtime/m4/Makefile.am patch | blob | blame | history
gettext-runtime/m4/ansi-c++.m4 [deleted file] patch | blob | blame | history
gettext-tools/ChangeLog patch | blob | blame | history
gettext-tools/configure.ac patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index cb91a597bed0b7403e8d2f440436575749c7dae4..fac7e34d8d1e1ac592fa4b6528902d579812046a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/autogen.sh b/autogen.sh
index 85bdbea3da8d5889eab1022041a5e7fcd2abc62e..b8e6b7183a4701bdd1e683c1d96c341ea75e13b6 100755 (executable)
--- 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 9118fe689cead6aec76b50e621415b0955937da8..94836cc5959cbcc0dcfb690800141e17e8f36792 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -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.
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index df3584bedf8b497b15b885b05aaf964c13397f5f..99c80bab631cd27dd82d435b1a5396531375191e 100644 (file)
--- 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 982cdcb992b19aba23a6e8b575c431c14fbec41d..456825d35811af972420837808cd455b9a86f6ff 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -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.
diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index 7eccc645249996282cefcb5493093b593b73c861..bf10c67b2aa7bf24c1df9c27f0e879a544ac3ceb 100644 (file)
--- 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 (file)
index 9056160..0000000
--- 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 <<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
-])
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index f31bab1ae0edd056a71e6d6db96a0cb328674e3f..f6519571568572b4e1234520bb126de86c9583bf 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -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.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 4a76c1d8332c8bd71e34c4db225c224104da30d6..157f2e28d1e8cf7d0f5432c0d7c8e0ab5ae0cddc 100644 (file)
--- 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
Mirror of https://github.com/autotools-mirror/gettext.git