1998-04-29 18:34:27 +02:00
|
|
|
/* Implementation of the bindtextdomain(3) function
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
|
1998-04-29 18:34:27 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
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 2, or (at your option)
|
1998-04-29 18:34:27 +02:00
|
|
|
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
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
1998-04-29 18:34:27 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with this program; if not, write to the Free Software
|
2005-05-13 10:03:47 +02:00
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
USA. */
|
1998-04-29 18:34:27 +02:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
1998-04-29 18:34:27 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
#ifdef _LIBC
|
|
|
|
# include <libintl.h>
|
1998-04-29 18:34:27 +02:00
|
|
|
#else
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
# include "libgnuintl.h"
|
1998-04-29 18:34:27 +02:00
|
|
|
#endif
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
#include "gettextP.h"
|
1998-04-29 18:34:27 +02:00
|
|
|
|
|
|
|
#ifdef _LIBC
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* We have to handle multi-threaded applications. */
|
|
|
|
# include <bits/libc-lock.h>
|
1998-04-29 18:34:27 +02:00
|
|
|
#else
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* Provide dummy implementation if this is outside glibc. */
|
|
|
|
# define __libc_rwlock_define(CLASS, NAME)
|
|
|
|
# define __libc_rwlock_wrlock(NAME)
|
|
|
|
# define __libc_rwlock_unlock(NAME)
|
1998-04-29 18:34:27 +02:00
|
|
|
#endif
|
|
|
|
|
2000-09-19 00:05:52 +02:00
|
|
|
/* The internal variables in the standalone libintl.a must have different
|
|
|
|
names than the internal variables in GNU libc, otherwise programs
|
|
|
|
using libintl.a cannot be linked statically. */
|
|
|
|
#if !defined _LIBC
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
# define _nl_default_dirname libintl_nl_default_dirname
|
|
|
|
# define _nl_domain_bindings libintl_nl_domain_bindings
|
2000-09-19 00:05:52 +02:00
|
|
|
#endif
|
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
|
|
|
|
#ifndef offsetof
|
|
|
|
# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
|
|
|
|
#endif
|
|
|
|
|
1998-04-29 18:34:27 +02:00
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
|
|
|
|
/* Contains the default location of the message catalogs. */
|
|
|
|
extern const char _nl_default_dirname[];
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
#ifdef _LIBC
|
|
|
|
extern const char _nl_default_dirname_internal[] attribute_hidden;
|
|
|
|
#else
|
|
|
|
# define INTUSE(name) name
|
|
|
|
#endif
|
1998-04-29 18:34:27 +02:00
|
|
|
|
|
|
|
/* List with bindings of specific domains. */
|
|
|
|
extern struct binding *_nl_domain_bindings;
|
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* Lock variable to protect the global data in the gettext implementation. */
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
|
1998-04-29 18:34:27 +02:00
|
|
|
|
|
|
|
/* 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 BINDTEXTDOMAIN __bindtextdomain
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
|
1998-04-29 18:34:27 +02:00
|
|
|
# ifndef strdup
|
|
|
|
# define strdup(str) __strdup (str)
|
|
|
|
# endif
|
|
|
|
#else
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
# define BINDTEXTDOMAIN libintl_bindtextdomain
|
|
|
|
# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
|
1998-04-29 18:34:27 +02:00
|
|
|
#endif
|
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* Prototypes for local functions. */
|
|
|
|
static void set_binding_values PARAMS ((const char *domainname,
|
|
|
|
const char **dirnamep,
|
|
|
|
const char **codesetp));
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
|
|
|
|
to be used for the DOMAINNAME message catalog.
|
|
|
|
If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
|
|
|
|
modified, only the current value is returned.
|
|
|
|
If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
|
|
|
|
modified nor returned. */
|
|
|
|
static void
|
|
|
|
set_binding_values (domainname, dirnamep, codesetp)
|
1998-04-29 18:34:27 +02:00
|
|
|
const char *domainname;
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
const char **dirnamep;
|
|
|
|
const char **codesetp;
|
1998-04-29 18:34:27 +02:00
|
|
|
{
|
|
|
|
struct binding *binding;
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
int modified;
|
1998-04-29 18:34:27 +02:00
|
|
|
|
|
|
|
/* Some sanity checks. */
|
|
|
|
if (domainname == NULL || domainname[0] == '\0')
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
{
|
|
|
|
if (dirnamep)
|
|
|
|
*dirnamep = NULL;
|
|
|
|
if (codesetp)
|
|
|
|
*codesetp = NULL;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
__libc_rwlock_wrlock (_nl_state_lock);
|
|
|
|
|
|
|
|
modified = 0;
|
1998-04-29 18:34:27 +02:00
|
|
|
|
|
|
|
for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
|
|
|
|
{
|
|
|
|
int compare = strcmp (domainname, binding->domainname);
|
|
|
|
if (compare == 0)
|
|
|
|
/* We found it! */
|
|
|
|
break;
|
|
|
|
if (compare < 0)
|
|
|
|
{
|
|
|
|
/* It is not in the list. */
|
|
|
|
binding = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (binding != NULL)
|
|
|
|
{
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
if (dirnamep)
|
1998-04-29 18:34:27 +02:00
|
|
|
{
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
const char *dirname = *dirnamep;
|
1998-04-29 18:34:27 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
if (dirname == NULL)
|
|
|
|
/* The current binding has be to returned. */
|
|
|
|
*dirnamep = binding->dirname;
|
1998-04-29 18:34:27 +02:00
|
|
|
else
|
|
|
|
{
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* The domain is already bound. If the new value and the old
|
|
|
|
one are equal we simply do nothing. Otherwise replace the
|
|
|
|
old binding. */
|
|
|
|
char *result = binding->dirname;
|
|
|
|
if (strcmp (dirname, result) != 0)
|
|
|
|
{
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
|
|
|
|
result = (char *) INTUSE(_nl_default_dirname);
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
else
|
|
|
|
{
|
1998-04-29 18:34:27 +02:00
|
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
result = strdup (dirname);
|
1998-04-29 18:34:27 +02:00
|
|
|
#else
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
size_t len = strlen (dirname) + 1;
|
|
|
|
result = (char *) malloc (len);
|
|
|
|
if (__builtin_expect (result != NULL, 1))
|
|
|
|
memcpy (result, dirname, len);
|
1998-04-29 18:34:27 +02:00
|
|
|
#endif
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (__builtin_expect (result != NULL, 1))
|
|
|
|
{
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
if (binding->dirname != INTUSE(_nl_default_dirname))
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
free (binding->dirname);
|
|
|
|
|
|
|
|
binding->dirname = result;
|
|
|
|
modified = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*dirnamep = result;
|
1998-04-29 18:34:27 +02:00
|
|
|
}
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
}
|
1998-04-29 18:34:27 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
if (codesetp)
|
|
|
|
{
|
|
|
|
const char *codeset = *codesetp;
|
1998-04-29 18:34:27 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
if (codeset == NULL)
|
|
|
|
/* The current binding has be to returned. */
|
|
|
|
*codesetp = binding->codeset;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* The domain is already bound. If the new value and the old
|
|
|
|
one are equal we simply do nothing. Otherwise replace the
|
|
|
|
old binding. */
|
|
|
|
char *result = binding->codeset;
|
|
|
|
if (result == NULL || strcmp (codeset, result) != 0)
|
|
|
|
{
|
|
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
|
|
result = strdup (codeset);
|
|
|
|
#else
|
|
|
|
size_t len = strlen (codeset) + 1;
|
|
|
|
result = (char *) malloc (len);
|
|
|
|
if (__builtin_expect (result != NULL, 1))
|
|
|
|
memcpy (result, codeset, len);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (__builtin_expect (result != NULL, 1))
|
|
|
|
{
|
|
|
|
if (binding->codeset != NULL)
|
|
|
|
free (binding->codeset);
|
|
|
|
|
|
|
|
binding->codeset = result;
|
|
|
|
binding->codeset_cntr++;
|
|
|
|
modified = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*codesetp = result;
|
|
|
|
}
|
1998-04-29 18:34:27 +02:00
|
|
|
}
|
|
|
|
}
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
else if ((dirnamep == NULL || *dirnamep == NULL)
|
|
|
|
&& (codesetp == NULL || *codesetp == NULL))
|
|
|
|
{
|
|
|
|
/* Simply return the default values. */
|
|
|
|
if (dirnamep)
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
*dirnamep = INTUSE(_nl_default_dirname);
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
if (codesetp)
|
|
|
|
*codesetp = NULL;
|
|
|
|
}
|
1998-04-29 18:34:27 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We have to create a new binding. */
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
size_t len = strlen (domainname) + 1;
|
1998-04-29 18:34:27 +02:00
|
|
|
struct binding *new_binding =
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
(struct binding *) malloc (offsetof (struct binding, domainname) + len);
|
1998-04-29 18:34:27 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
if (__builtin_expect (new_binding == NULL, 0))
|
|
|
|
goto failed;
|
1998-04-29 18:34:27 +02:00
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
memcpy (new_binding->domainname, domainname, len);
|
|
|
|
|
|
|
|
if (dirnamep)
|
|
|
|
{
|
|
|
|
const char *dirname = *dirnamep;
|
|
|
|
|
|
|
|
if (dirname == NULL)
|
|
|
|
/* The default value. */
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
dirname = INTUSE(_nl_default_dirname);
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
else
|
|
|
|
{
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
|
|
|
|
dirname = INTUSE(_nl_default_dirname);
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
char *result;
|
1998-04-29 18:34:27 +02:00
|
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
result = strdup (dirname);
|
|
|
|
if (__builtin_expect (result == NULL, 0))
|
|
|
|
goto failed_dirname;
|
1998-04-29 18:34:27 +02:00
|
|
|
#else
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
size_t len = strlen (dirname) + 1;
|
|
|
|
result = (char *) malloc (len);
|
|
|
|
if (__builtin_expect (result == NULL, 0))
|
|
|
|
goto failed_dirname;
|
|
|
|
memcpy (result, dirname, len);
|
1998-04-29 18:34:27 +02:00
|
|
|
#endif
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
dirname = result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*dirnamep = dirname;
|
|
|
|
new_binding->dirname = (char *) dirname;
|
|
|
|
}
|
1998-04-29 18:34:27 +02:00
|
|
|
else
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* The default value. */
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
|
|
|
|
new_binding->codeset_cntr = 0;
|
|
|
|
|
|
|
|
if (codesetp)
|
1998-04-29 18:34:27 +02:00
|
|
|
{
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
const char *codeset = *codesetp;
|
|
|
|
|
|
|
|
if (codeset != NULL)
|
|
|
|
{
|
|
|
|
char *result;
|
|
|
|
|
1998-04-29 18:34:27 +02:00
|
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
result = strdup (codeset);
|
|
|
|
if (__builtin_expect (result == NULL, 0))
|
|
|
|
goto failed_codeset;
|
1998-04-29 18:34:27 +02:00
|
|
|
#else
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
size_t len = strlen (codeset) + 1;
|
|
|
|
result = (char *) malloc (len);
|
|
|
|
if (__builtin_expect (result == NULL, 0))
|
|
|
|
goto failed_codeset;
|
|
|
|
memcpy (result, codeset, len);
|
1998-04-29 18:34:27 +02:00
|
|
|
#endif
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
codeset = result;
|
|
|
|
new_binding->codeset_cntr++;
|
|
|
|
}
|
|
|
|
*codesetp = codeset;
|
|
|
|
new_binding->codeset = (char *) codeset;
|
1998-04-29 18:34:27 +02:00
|
|
|
}
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
else
|
|
|
|
new_binding->codeset = NULL;
|
1998-04-29 18:34:27 +02:00
|
|
|
|
|
|
|
/* Now enqueue it. */
|
|
|
|
if (_nl_domain_bindings == NULL
|
|
|
|
|| strcmp (domainname, _nl_domain_bindings->domainname) < 0)
|
|
|
|
{
|
|
|
|
new_binding->next = _nl_domain_bindings;
|
|
|
|
_nl_domain_bindings = new_binding;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
binding = _nl_domain_bindings;
|
|
|
|
while (binding->next != NULL
|
|
|
|
&& strcmp (domainname, binding->next->domainname) > 0)
|
|
|
|
binding = binding->next;
|
|
|
|
|
|
|
|
new_binding->next = binding->next;
|
|
|
|
binding->next = new_binding;
|
|
|
|
}
|
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
modified = 1;
|
|
|
|
|
|
|
|
/* Here we deal with memory allocation failures. */
|
|
|
|
if (0)
|
|
|
|
{
|
|
|
|
failed_codeset:
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
if (new_binding->dirname != INTUSE(_nl_default_dirname))
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
free (new_binding->dirname);
|
|
|
|
failed_dirname:
|
|
|
|
free (new_binding);
|
|
|
|
failed:
|
|
|
|
if (dirnamep)
|
|
|
|
*dirnamep = NULL;
|
|
|
|
if (codesetp)
|
|
|
|
*codesetp = NULL;
|
|
|
|
}
|
1998-04-29 18:34:27 +02:00
|
|
|
}
|
|
|
|
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* If we modified any binding, we flush the caches. */
|
|
|
|
if (modified)
|
|
|
|
++_nl_msg_cat_cntr;
|
|
|
|
|
|
|
|
__libc_rwlock_unlock (_nl_state_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Specify that the DOMAINNAME message catalog will be found
|
|
|
|
in DIRNAME rather than in the system locale data base. */
|
|
|
|
char *
|
|
|
|
BINDTEXTDOMAIN (domainname, dirname)
|
|
|
|
const char *domainname;
|
|
|
|
const char *dirname;
|
|
|
|
{
|
|
|
|
set_binding_values (domainname, &dirname, NULL);
|
|
|
|
return (char *) dirname;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Specify the character encoding in which the messages from the
|
|
|
|
DOMAINNAME message catalog will be returned. */
|
|
|
|
char *
|
|
|
|
BIND_TEXTDOMAIN_CODESET (domainname, codeset)
|
|
|
|
const char *domainname;
|
|
|
|
const char *codeset;
|
|
|
|
{
|
|
|
|
set_binding_values (domainname, NULL, &codeset);
|
|
|
|
return (char *) codeset;
|
1998-04-29 18:34:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* Aliases for function names in GNU C Library. */
|
1998-04-29 18:34:27 +02:00
|
|
|
weak_alias (__bindtextdomain, bindtextdomain);
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
|
1998-04-29 18:34:27 +02:00
|
|
|
#endif
|