CVS libidn/gl

[libidn-commit]

Update of /home/cvs/libidn/gl
In directory dopio:/tmp/cvs-serv5000

Modified Files:
        Makefile.am dummy.c gettext.h 
Log Message:
Sync with gnulib.

--- /home/cvs/libidn/gl/Makefile.am     2005/01/29 00:22:43     1.15
+++ /home/cvs/libidn/gl/Makefile.am     2005/05/26 14:42:00     1.16
@@ -9,7 +9,7 @@
 #
 # Generated by gnulib-tool.
 # Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --libtool --lgpl dummy error getopt gettext strdup
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --aux-dir=. --libtool --lgpl dummy error getopt gettext strdup
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
@@ -52,11 +52,5 @@
 
 ## end   gnulib module gettext
 
-## begin gnulib module strdup
-
-libgnu_la_SOURCES += strdup.h
-
-## end   gnulib module strdup
-
 
 # Makefile.am ends here
--- /home/cvs/libidn/gl/dummy.c 2005/05/26 14:39:51     1.6
+++ /home/cvs/libidn/gl/dummy.c 2005/05/26 14:42:00     1.7
@@ -2,16 +2,16 @@
    Copyright (C) 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
--- /home/cvs/libidn/gl/gettext.h       2005/05/26 14:39:51     1.2
+++ /home/cvs/libidn/gl/gettext.h       2005/05/26 14:42:00     1.3
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -36,6 +36,16 @@
 # include <locale.h>
 #endif
 
+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+   <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
+   it now, to make later inclusions of <libintl.h> a NOP.  */
+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+# include <cstdlib>
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+#  include <libintl.h>
+# endif
+#endif
+
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings
    for invalid uses of the value returned from these functions.