diff options
author | Paolo Bonzini <bonzini@gnu.org> | 2009-11-20 21:45:37 +0100 |
---|---|---|
committer | Paolo Bonzini <bonzini@gnu.org> | 2009-11-20 22:52:21 +0100 |
commit | de741047d4a3f38d04e2652894c33e532a3881cd (patch) | |
tree | f126ecbff9c812e8756efb4eb15bf889859ed518 /intl/gettext.c | |
parent | b88789855b94284885af19ca30d1a6fdd4b59886 (diff) | |
download | grep-de741047d4a3f38d04e2652894c33e532a3881cd.tar.gz |
upgrade to external gettext, modernize handling of m4 subdirectory
* configure.ac.in (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
(AC_OUTPUT): Remove m4/Makefile creation.
* Makefile.am (subdirs): Remove m4 subdirectory.
(EXTRA_DIST): Add build-aux/config.rpath.
* intl/*: Remove.
* m4/Makefile.am: Remove.
* m4/codeset.m4: Remove.
* m4/glibc.m4: Remove.
* m4/glibc21.m4: Remove.
* m4/header.m4: Remove.
* m4/install.m4: Remove.
* m4/isc-posix.m4: Remove.
* m4/lcmessage.m4: Remove.
* m4/sanity.m4: Remove.
* m4/gettext.m4: Upgrade to gettext-0.17.
* m4/iconv.m4: Upgrade to gettext-0.17.
* m4/lib-ld.m4: New file, from gettext-0.17.
* m4/lib-link.m4: New file, from gettext-0.17.
* m4/lib-prefix.m4: New file, from gettext-0.17.
* m4/nls.m4: New file, from gettext-0.17.
* m4/po.m4: New file, from gettext-0.17.
* m4/progtest.m4: Upgrade to gettext-0.17.
* m4/Makefile.am (EXTRA_DIST): Add the new files.
* po/Makefile.in.in: Upgrade to gettext-0.17.
* po/Makevars: New.
* po/cat-id-tbl.c: New.
* src/Makefile.am: Replace @INTLLIBS@ with @LIBINTL@.
Diffstat (limited to 'intl/gettext.c')
-rw-r--r-- | intl/gettext.c | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/intl/gettext.c b/intl/gettext.c deleted file mode 100644 index fde37d06..00000000 --- a/intl/gettext.c +++ /dev/null @@ -1,64 +0,0 @@ -/* Implementation of gettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 3, 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library 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. */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#ifdef _LIBC -# define __need_NULL -# include <stddef.h> -#else -# include <stdlib.h> /* Just for NULL. */ -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include <libintl.h> -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define GETTEXT __gettext -# define DCGETTEXT __dcgettext -#else -# define GETTEXT gettext__ -# define DCGETTEXT dcgettext__ -#endif - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -char * -GETTEXT (msgid) - const char *msgid; -{ - return DCGETTEXT (NULL, msgid, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__gettext, gettext); -#endif |