mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-12 08:41:46 +00:00
[the "translation" patch series] Part 1: upgrading to gettext 0.14.6
* m4/*: * intl/*: * ABOUT-NLS: * po/Makefile.in.in: * po/POTFILES.in: * po/Makevars.template: * config/mkinstalldirs: * config/config.rpath: update from gettext 0.14.6 source. This enables translation to system language on Mac OS X git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19348 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
b08540d0d8
commit
eee9800ce4
@ -2,28 +2,13 @@
|
|||||||
# Output a system dependent set of variables, describing how to set the
|
# Output a system dependent set of variables, describing how to set the
|
||||||
# run time search path of shared libraries in an executable.
|
# run time search path of shared libraries in an executable.
|
||||||
#
|
#
|
||||||
# Copyright 1996-2003 Free Software Foundation, Inc.
|
# Copyright 1996-2005 Free Software Foundation, Inc.
|
||||||
# Taken from GNU libtool, 2001
|
# Taken from GNU libtool, 2001
|
||||||
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This file is free software; the Free Software Foundation gives
|
||||||
# it under the terms of the GNU General Public License as published by
|
# unlimited permission to copy and/or distribute it, with or without
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
# modifications, as long as this notice is preserved.
|
||||||
# (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.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
# configuration script generated by Autoconf, you may include it under
|
|
||||||
# the same distribution terms that you use for the rest of that program.
|
|
||||||
#
|
#
|
||||||
# The first argument passed to this file is the canonical host specification,
|
# The first argument passed to this file is the canonical host specification,
|
||||||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
|
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
|
||||||
@ -50,6 +35,8 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|||||||
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||||||
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
|
|
||||||
|
cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
|
||||||
|
|
||||||
# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
|
# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
|
||||||
|
|
||||||
wl=
|
wl=
|
||||||
@ -60,6 +47,13 @@ else
|
|||||||
aix*)
|
aix*)
|
||||||
wl='-Wl,'
|
wl='-Wl,'
|
||||||
;;
|
;;
|
||||||
|
darwin*)
|
||||||
|
case "$cc_basename" in
|
||||||
|
xlc*)
|
||||||
|
wl='-Wl,'
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
mingw* | pw32* | os2*)
|
mingw* | pw32* | os2*)
|
||||||
;;
|
;;
|
||||||
hpux9* | hpux10* | hpux11*)
|
hpux9* | hpux10* | hpux11*)
|
||||||
@ -71,13 +65,19 @@ else
|
|||||||
newsos6)
|
newsos6)
|
||||||
;;
|
;;
|
||||||
linux*)
|
linux*)
|
||||||
case $CC in
|
case $cc_basename in
|
||||||
icc|ecc)
|
icc* | ecc*)
|
||||||
wl='-Wl,'
|
wl='-Wl,'
|
||||||
;;
|
;;
|
||||||
ccc)
|
pgcc | pgf77 | pgf90)
|
||||||
wl='-Wl,'
|
wl='-Wl,'
|
||||||
;;
|
;;
|
||||||
|
ccc*)
|
||||||
|
wl='-Wl,'
|
||||||
|
;;
|
||||||
|
como)
|
||||||
|
wl='-lopt='
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
osf3* | osf4* | osf5*)
|
osf3* | osf4* | osf5*)
|
||||||
@ -96,6 +96,9 @@ else
|
|||||||
;;
|
;;
|
||||||
sysv4*MP*)
|
sysv4*MP*)
|
||||||
;;
|
;;
|
||||||
|
unicos*)
|
||||||
|
wl='-Wl,'
|
||||||
|
;;
|
||||||
uts4*)
|
uts4*)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -138,7 +141,7 @@ if test "$with_gnu_ld" = yes; then
|
|||||||
# that the semantics of dynamic libraries on AmigaOS, at least up
|
# that the semantics of dynamic libraries on AmigaOS, at least up
|
||||||
# to version 4, is to share data among multiple programs linked
|
# to version 4, is to share data among multiple programs linked
|
||||||
# with the same dynamic library. Since this doesn't match the
|
# with the same dynamic library. Since this doesn't match the
|
||||||
# behavior of shared libraries on other platforms, we can use
|
# behavior of shared libraries on other platforms, we cannot use
|
||||||
# them.
|
# them.
|
||||||
ld_shlibs=no
|
ld_shlibs=no
|
||||||
;;
|
;;
|
||||||
@ -173,6 +176,13 @@ if test "$with_gnu_ld" = yes; then
|
|||||||
sunos4*)
|
sunos4*)
|
||||||
hardcode_direct=yes
|
hardcode_direct=yes
|
||||||
;;
|
;;
|
||||||
|
linux*)
|
||||||
|
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||||
|
:
|
||||||
|
else
|
||||||
|
ld_shlibs=no
|
||||||
|
fi
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||||
:
|
:
|
||||||
@ -266,7 +276,7 @@ else
|
|||||||
# see comment about different semantics on the GNU ld section
|
# see comment about different semantics on the GNU ld section
|
||||||
ld_shlibs=no
|
ld_shlibs=no
|
||||||
;;
|
;;
|
||||||
bsdi4*)
|
bsdi[45]*)
|
||||||
;;
|
;;
|
||||||
cygwin* | mingw* | pw32*)
|
cygwin* | mingw* | pw32*)
|
||||||
# When not using gcc, we currently assume that we are using
|
# When not using gcc, we currently assume that we are using
|
||||||
@ -277,8 +287,17 @@ else
|
|||||||
libext=lib
|
libext=lib
|
||||||
;;
|
;;
|
||||||
darwin* | rhapsody*)
|
darwin* | rhapsody*)
|
||||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
hardcode_direct=no
|
||||||
hardcode_direct=no
|
if test "$GCC" = yes ; then
|
||||||
|
:
|
||||||
|
else
|
||||||
|
case "$cc_basename" in
|
||||||
|
xlc*)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
ld_shlibs=no
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
dgux*)
|
dgux*)
|
||||||
@ -295,7 +314,7 @@ else
|
|||||||
hardcode_direct=yes
|
hardcode_direct=yes
|
||||||
hardcode_minus_L=yes
|
hardcode_minus_L=yes
|
||||||
;;
|
;;
|
||||||
freebsd*)
|
freebsd* | kfreebsd*-gnu | dragonfly*)
|
||||||
hardcode_libdir_flag_spec='-R$libdir'
|
hardcode_libdir_flag_spec='-R$libdir'
|
||||||
hardcode_direct=yes
|
hardcode_direct=yes
|
||||||
;;
|
;;
|
||||||
@ -438,7 +457,7 @@ case "$host_os" in
|
|||||||
;;
|
;;
|
||||||
beos*)
|
beos*)
|
||||||
;;
|
;;
|
||||||
bsdi4*)
|
bsdi[45]*)
|
||||||
;;
|
;;
|
||||||
cygwin* | mingw* | pw32*)
|
cygwin* | mingw* | pw32*)
|
||||||
shrext=.dll
|
shrext=.dll
|
||||||
@ -450,6 +469,8 @@ case "$host_os" in
|
|||||||
;;
|
;;
|
||||||
freebsd1*)
|
freebsd1*)
|
||||||
;;
|
;;
|
||||||
|
kfreebsd*-gnu)
|
||||||
|
;;
|
||||||
freebsd*)
|
freebsd*)
|
||||||
;;
|
;;
|
||||||
gnu*)
|
gnu*)
|
||||||
@ -486,11 +507,13 @@ case "$host_os" in
|
|||||||
;;
|
;;
|
||||||
linux*)
|
linux*)
|
||||||
;;
|
;;
|
||||||
|
knetbsd*-gnu)
|
||||||
|
;;
|
||||||
netbsd*)
|
netbsd*)
|
||||||
;;
|
;;
|
||||||
newsos6)
|
newsos6)
|
||||||
;;
|
;;
|
||||||
nto-qnx)
|
nto-qnx*)
|
||||||
;;
|
;;
|
||||||
openbsd*)
|
openbsd*)
|
||||||
;;
|
;;
|
||||||
@ -519,7 +542,7 @@ escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|||||||
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
|
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
|
||||||
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
||||||
|
|
||||||
sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
|
LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
|
||||||
|
|
||||||
# How to pass a linker flag through the compiler.
|
# How to pass a linker flag through the compiler.
|
||||||
wl="$escaped_wl"
|
wl="$escaped_wl"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# mkinstalldirs --- make directory hierarchy
|
# mkinstalldirs --- make directory hierarchy
|
||||||
|
|
||||||
scriptversion=2005-02-02.21
|
scriptversion=2004-02-15.20
|
||||||
|
|
||||||
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
|
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
|
||||||
# Created: 1993-05-16
|
# Created: 1993-05-16
|
||||||
@ -27,7 +27,7 @@ while test $# -gt 0 ; do
|
|||||||
case $1 in
|
case $1 in
|
||||||
-h | --help | --h*) # -h for help
|
-h | --help | --h*) # -h for help
|
||||||
echo "$usage"
|
echo "$usage"
|
||||||
exit $?
|
exit 0
|
||||||
;;
|
;;
|
||||||
-m) # -m PERM arg
|
-m) # -m PERM arg
|
||||||
shift
|
shift
|
||||||
@ -37,7 +37,7 @@ while test $# -gt 0 ; do
|
|||||||
;;
|
;;
|
||||||
--version)
|
--version)
|
||||||
echo "$0 $scriptversion"
|
echo "$0 $scriptversion"
|
||||||
exit $?
|
exit 0
|
||||||
;;
|
;;
|
||||||
--) # stop option processing
|
--) # stop option processing
|
||||||
shift
|
shift
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Makefile for directory with message catalog handling library of GNU gettext
|
# Makefile for directory with message catalog handling library of GNU gettext
|
||||||
# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
|
# Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify it
|
# 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
|
# under the terms of the GNU Library General Public License as published
|
||||||
@ -13,7 +13,7 @@
|
|||||||
#
|
#
|
||||||
# You should have received a copy of the GNU Library General Public
|
# You should have received a copy of the GNU Library General Public
|
||||||
# License along with this program; if not, write to the Free Software
|
# License along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
# USA.
|
# USA.
|
||||||
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
@ -99,6 +99,7 @@ SOURCES = \
|
|||||||
plural-exp.c \
|
plural-exp.c \
|
||||||
localcharset.c \
|
localcharset.c \
|
||||||
relocatable.c \
|
relocatable.c \
|
||||||
|
langprefs.c \
|
||||||
localename.c \
|
localename.c \
|
||||||
log.c \
|
log.c \
|
||||||
printf.c \
|
printf.c \
|
||||||
@ -124,6 +125,7 @@ OBJECTS = \
|
|||||||
plural-exp.$lo \
|
plural-exp.$lo \
|
||||||
localcharset.$lo \
|
localcharset.$lo \
|
||||||
relocatable.$lo \
|
relocatable.$lo \
|
||||||
|
langprefs.$lo \
|
||||||
localename.$lo \
|
localename.$lo \
|
||||||
log.$lo \
|
log.$lo \
|
||||||
printf.$lo \
|
printf.$lo \
|
||||||
@ -153,7 +155,7 @@ libintl.a libgnuintl.a: $(OBJECTS)
|
|||||||
libintl.la libgnuintl.la: $(OBJECTS)
|
libintl.la libgnuintl.la: $(OBJECTS)
|
||||||
$(LIBTOOL) --mode=link \
|
$(LIBTOOL) --mode=link \
|
||||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
|
$(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
|
||||||
$(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
|
$(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
|
||||||
-version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
|
-version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
|
||||||
-rpath $(libdir) \
|
-rpath $(libdir) \
|
||||||
-no-undefined
|
-no-undefined
|
||||||
@ -164,7 +166,7 @@ libintl.la libgnuintl.la: $(OBJECTS)
|
|||||||
# Maintainers of other packages that include the intl directory must *not*
|
# Maintainers of other packages that include the intl directory must *not*
|
||||||
# change these values.
|
# change these values.
|
||||||
LTV_CURRENT=7
|
LTV_CURRENT=7
|
||||||
LTV_REVISION=0
|
LTV_REVISION=3
|
||||||
LTV_AGE=4
|
LTV_AGE=4
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
@ -213,6 +215,8 @@ localcharset.lo: $(srcdir)/localcharset.c
|
|||||||
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
|
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
|
||||||
relocatable.lo: $(srcdir)/relocatable.c
|
relocatable.lo: $(srcdir)/relocatable.c
|
||||||
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
|
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
|
||||||
|
langprefs.lo: $(srcdir)/langprefs.c
|
||||||
|
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
|
||||||
localename.lo: $(srcdir)/localename.c
|
localename.lo: $(srcdir)/localename.c
|
||||||
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
|
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
|
||||||
log.lo: $(srcdir)/log.c
|
log.lo: $(srcdir)/log.c
|
||||||
@ -272,7 +276,8 @@ install-exec: all
|
|||||||
: ; \
|
: ; \
|
||||||
fi
|
fi
|
||||||
if test "$(PACKAGE)" = "gettext-tools" \
|
if test "$(PACKAGE)" = "gettext-tools" \
|
||||||
&& test '@USE_INCLUDED_LIBINTL@' = no; then \
|
&& test '@USE_INCLUDED_LIBINTL@' = no \
|
||||||
|
&& test @GLIBC2@ != no; then \
|
||||||
$(mkinstalldirs) $(DESTDIR)$(libdir); \
|
$(mkinstalldirs) $(DESTDIR)$(libdir); \
|
||||||
$(LIBTOOL) --mode=install \
|
$(LIBTOOL) --mode=install \
|
||||||
$(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
|
$(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
|
||||||
@ -347,7 +352,8 @@ installdirs:
|
|||||||
: ; \
|
: ; \
|
||||||
fi
|
fi
|
||||||
if test "$(PACKAGE)" = "gettext-tools" \
|
if test "$(PACKAGE)" = "gettext-tools" \
|
||||||
&& test '@USE_INCLUDED_LIBINTL@' = no; then \
|
&& test '@USE_INCLUDED_LIBINTL@' = no \
|
||||||
|
&& test @GLIBC2@ != no; then \
|
||||||
$(mkinstalldirs) $(DESTDIR)$(libdir); \
|
$(mkinstalldirs) $(DESTDIR)$(libdir); \
|
||||||
else \
|
else \
|
||||||
: ; \
|
: ; \
|
||||||
@ -377,7 +383,8 @@ uninstall:
|
|||||||
: ; \
|
: ; \
|
||||||
fi
|
fi
|
||||||
if test "$(PACKAGE)" = "gettext-tools" \
|
if test "$(PACKAGE)" = "gettext-tools" \
|
||||||
&& test '@USE_INCLUDED_LIBINTL@' = no; then \
|
&& test '@USE_INCLUDED_LIBINTL@' = no \
|
||||||
|
&& test @GLIBC2@ != no; then \
|
||||||
rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
|
rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
|
||||||
else \
|
else \
|
||||||
: ; \
|
: ; \
|
||||||
@ -479,7 +486,7 @@ dist distdir: Makefile
|
|||||||
$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
|
$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
|
||||||
for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
|
for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
|
||||||
if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
|
if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
|
||||||
cp -p $$dir/$$file $(distdir); \
|
cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
|
||||||
done; \
|
done; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
GNU gettext library from gettext-0.14.1
|
GNU gettext library from gettext-0.14.5
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
#
|
#
|
||||||
# You should have received a copy of the GNU Library General Public
|
# You should have received a copy of the GNU Library General Public
|
||||||
# License along with this program; if not, write to the Free Software
|
# License along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
# USA.
|
# USA.
|
||||||
#
|
#
|
||||||
# The table consists of lines of the form
|
# The table consists of lines of the form
|
||||||
@ -38,12 +38,12 @@
|
|||||||
# ISO-8859-4 Y osf solaris freebsd darwin
|
# ISO-8859-4 Y osf solaris freebsd darwin
|
||||||
# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
|
# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
|
||||||
# ISO-8859-6 Y glibc aix hpux solaris
|
# ISO-8859-6 Y glibc aix hpux solaris
|
||||||
# ISO-8859-7 Y glibc aix hpux irix osf solaris
|
# ISO-8859-7 Y glibc aix hpux irix osf solaris darwin
|
||||||
# ISO-8859-8 Y glibc aix hpux osf solaris
|
# ISO-8859-8 Y glibc aix hpux osf solaris
|
||||||
# ISO-8859-9 Y glibc aix hpux irix osf solaris
|
# ISO-8859-9 Y glibc aix hpux irix osf solaris darwin
|
||||||
# ISO-8859-13 glibc
|
# ISO-8859-13 glibc darwin
|
||||||
# ISO-8859-14 glibc
|
# ISO-8859-14 glibc
|
||||||
# ISO-8859-15 glibc aix osf solaris freebsd
|
# ISO-8859-15 glibc aix osf solaris freebsd darwin
|
||||||
# KOI8-R Y glibc solaris freebsd darwin
|
# KOI8-R Y glibc solaris freebsd darwin
|
||||||
# KOI8-U Y glibc freebsd darwin
|
# KOI8-U Y glibc freebsd darwin
|
||||||
# KOI8-T glibc
|
# KOI8-T glibc
|
||||||
@ -100,7 +100,7 @@
|
|||||||
# HP-KANA8 hpux
|
# HP-KANA8 hpux
|
||||||
# DEC-KANJI osf
|
# DEC-KANJI osf
|
||||||
# DEC-HANYU osf
|
# DEC-HANYU osf
|
||||||
# UTF-8 Y glibc aix hpux osf solaris
|
# UTF-8 Y glibc aix hpux osf solaris darwin
|
||||||
#
|
#
|
||||||
# Note: Names which are not marked as being a MIME name should not be used in
|
# Note: Names which are not marked as being a MIME name should not be used in
|
||||||
# Internet protocols for information interchange (mail, news, etc.).
|
# Internet protocols for information interchange (mail, news, etc.).
|
||||||
@ -396,7 +396,7 @@ case "$os" in
|
|||||||
echo "BIG5 BIG5"
|
echo "BIG5 BIG5"
|
||||||
echo "SJIS SHIFT_JIS"
|
echo "SJIS SHIFT_JIS"
|
||||||
;;
|
;;
|
||||||
darwin*)
|
darwin[56]*)
|
||||||
# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
|
# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
|
||||||
# localcharset.c falls back to using the full locale name
|
# localcharset.c falls back to using the full locale name
|
||||||
# from the environment variables.
|
# from the environment variables.
|
||||||
@ -437,6 +437,36 @@ case "$os" in
|
|||||||
echo "ja_JP.SJIS SHIFT_JIS"
|
echo "ja_JP.SJIS SHIFT_JIS"
|
||||||
echo "ko_KR.EUC EUC-KR"
|
echo "ko_KR.EUC EUC-KR"
|
||||||
;;
|
;;
|
||||||
|
darwin*)
|
||||||
|
# Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
|
||||||
|
# - It returns the empty string when LANG is set to a locale of the
|
||||||
|
# form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
|
||||||
|
# LC_CTYPE file.
|
||||||
|
# - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
|
||||||
|
# the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
|
||||||
|
# - The documentation says:
|
||||||
|
# "... all code that calls BSD system routines should ensure
|
||||||
|
# that the const *char parameters of these routines are in UTF-8
|
||||||
|
# encoding. All BSD system functions expect their string
|
||||||
|
# parameters to be in UTF-8 encoding and nothing else."
|
||||||
|
# It also says
|
||||||
|
# "An additional caveat is that string parameters for files,
|
||||||
|
# paths, and other file-system entities must be in canonical
|
||||||
|
# UTF-8. In a canonical UTF-8 Unicode string, all decomposable
|
||||||
|
# characters are decomposed ..."
|
||||||
|
# but this is not true: You can pass non-decomposed UTF-8 strings
|
||||||
|
# to file system functions, and it is the OS which will convert
|
||||||
|
# them to decomposed UTF-8 before accessing the file system.
|
||||||
|
# - The Apple Terminal application displays UTF-8 by default.
|
||||||
|
# - However, other applications are free to use different encodings:
|
||||||
|
# - xterm uses ISO-8859-1 by default.
|
||||||
|
# - TextEdit uses MacRoman by default.
|
||||||
|
# We prefer UTF-8 over decomposed UTF-8-MAC because one should
|
||||||
|
# minimize the use of decomposed Unicode. Unfortunately, through the
|
||||||
|
# Darwin file system, decomposed UTF-8 strings are leaked into user
|
||||||
|
# space nevertheless.
|
||||||
|
echo "* UTF-8"
|
||||||
|
;;
|
||||||
beos*)
|
beos*)
|
||||||
# BeOS has a single locale, and it has UTF-8 encoding.
|
# BeOS has a single locale, and it has UTF-8 encoding.
|
||||||
echo "* UTF-8"
|
echo "* UTF-8"
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* Implementation of the internal dcigettext function.
|
/* Implementation of the internal dcigettext function.
|
||||||
Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
|
Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
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
|
under the terms of the GNU Library General Public License as published
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
||||||
@ -200,8 +200,8 @@ static void *mempcpy (void *dest, const void *src, size_t n);
|
|||||||
it may be concatenated to a directory pathname.
|
it may be concatenated to a directory pathname.
|
||||||
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
|
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
|
||||||
*/
|
*/
|
||||||
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
|
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
|
||||||
/* Win32, OS/2, DOS */
|
/* Win32, Cygwin, OS/2, DOS */
|
||||||
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
||||||
# define HAS_DEVICE(P) \
|
# define HAS_DEVICE(P) \
|
||||||
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
|
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
|
||||||
@ -1122,31 +1122,50 @@ category_to_name (int category)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Guess value of current locale from value of the environment variables. */
|
/* Guess value of current locale from value of the environment variables
|
||||||
|
or system-dependent defaults. */
|
||||||
static const char *
|
static const char *
|
||||||
internal_function
|
internal_function
|
||||||
guess_category_value (int category, const char *categoryname)
|
guess_category_value (int category, const char *categoryname)
|
||||||
{
|
{
|
||||||
const char *language;
|
const char *language;
|
||||||
const char *retval;
|
const char *locale;
|
||||||
|
#ifndef _LIBC
|
||||||
|
const char *language_default;
|
||||||
|
int locale_defaulted;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* The highest priority value is the `LANGUAGE' environment
|
/* We use the settings in the following order:
|
||||||
variable. But we don't use the value if the currently selected
|
1. The value of the environment variable 'LANGUAGE'. This is a GNU
|
||||||
locale is the C locale. This is a GNU extension. */
|
extension. Its value can be a colon-separated list of locale names.
|
||||||
language = getenv ("LANGUAGE");
|
2. The value of the environment variable 'LC_ALL', 'LC_xxx', or 'LANG'.
|
||||||
if (language != NULL && language[0] == '\0')
|
More precisely, the first among these that is set to a non-empty value.
|
||||||
language = NULL;
|
This is how POSIX specifies it. The value is a single locale name.
|
||||||
|
3. A system-dependent preference list of languages. Its value can be a
|
||||||
|
colon-separated list of locale names.
|
||||||
|
4. A system-dependent default locale name.
|
||||||
|
This way:
|
||||||
|
- System-dependent settings can be overridden by environment variables.
|
||||||
|
- If the system provides both a list of languages and a default locale,
|
||||||
|
the former is used. */
|
||||||
|
|
||||||
/* We have to proceed with the POSIX methods of looking to `LC_ALL',
|
/* Fetch the locale name, through the POSIX method of looking to `LC_ALL',
|
||||||
`LC_xxx', and `LANG'. On some systems this can be done by the
|
`LC_xxx', and `LANG'. On some systems this can be done by the
|
||||||
`setlocale' function itself. */
|
`setlocale' function itself. */
|
||||||
#ifdef _LIBC
|
#ifdef _LIBC
|
||||||
retval = __current_locale_name (category);
|
locale = __current_locale_name (category);
|
||||||
#else
|
#else
|
||||||
retval = _nl_locale_name (category, categoryname);
|
locale = _nl_locale_name_posix (category, categoryname);
|
||||||
|
locale_defaulted = 0;
|
||||||
|
if (locale == NULL)
|
||||||
|
{
|
||||||
|
locale = _nl_locale_name_default ();
|
||||||
|
locale_defaulted = 1;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Ignore LANGUAGE if the locale is set to "C" because
|
/* Ignore LANGUAGE and its system-dependent analogon if the locale is set
|
||||||
|
to "C" because
|
||||||
1. "C" locale usually uses the ASCII encoding, and most international
|
1. "C" locale usually uses the ASCII encoding, and most international
|
||||||
messages use non-ASCII characters. These characters get displayed
|
messages use non-ASCII characters. These characters get displayed
|
||||||
as question marks (if using glibc's iconv()) or as invalid 8-bit
|
as question marks (if using glibc's iconv()) or as invalid 8-bit
|
||||||
@ -1154,8 +1173,28 @@ guess_category_value (int category, const char *categoryname)
|
|||||||
characters to ASCII). In any case, the output is ugly.
|
characters to ASCII). In any case, the output is ugly.
|
||||||
2. The precise output of some programs in the "C" locale is specified
|
2. The precise output of some programs in the "C" locale is specified
|
||||||
by POSIX and should not depend on environment variables like
|
by POSIX and should not depend on environment variables like
|
||||||
"LANGUAGE". We allow such programs to use gettext(). */
|
"LANGUAGE" or system-dependent information. We allow such programs
|
||||||
return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
|
to use gettext(). */
|
||||||
|
if (strcmp (locale, "C") == 0)
|
||||||
|
return locale;
|
||||||
|
|
||||||
|
/* The highest priority value is the value of the 'LANGUAGE' environment
|
||||||
|
variable. */
|
||||||
|
language = getenv ("LANGUAGE");
|
||||||
|
if (language != NULL && language[0] != '\0')
|
||||||
|
return language;
|
||||||
|
#ifndef _LIBC
|
||||||
|
/* The next priority value is the locale name, if not defaulted. */
|
||||||
|
if (locale_defaulted)
|
||||||
|
{
|
||||||
|
/* The next priority value is the default language preferences list. */
|
||||||
|
language_default = _nl_language_preferences_default ();
|
||||||
|
if (language_default != NULL)
|
||||||
|
return language_default;
|
||||||
|
}
|
||||||
|
/* The least priority value is the locale name, if defaulted. */
|
||||||
|
#endif
|
||||||
|
return locale;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* @@ begin of epilog @@ */
|
/* @@ begin of epilog @@ */
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef STATIC
|
#ifndef STATIC
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* Header describing internals of libintl library.
|
/* Header describing internals of libintl library.
|
||||||
Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
|
Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
|
||||||
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
|
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
This program is free software; you can redistribute it and/or modify it
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _GETTEXTP_H
|
#ifndef _GETTEXTP_H
|
||||||
@ -151,6 +151,9 @@ struct binding
|
|||||||
extern int _nl_msg_cat_cntr;
|
extern int _nl_msg_cat_cntr;
|
||||||
|
|
||||||
#ifndef _LIBC
|
#ifndef _LIBC
|
||||||
|
const char *_nl_language_preferences_default (void);
|
||||||
|
const char *_nl_locale_name_posix (int category, const char *categoryname);
|
||||||
|
const char *_nl_locale_name_default (void);
|
||||||
const char *_nl_locale_name (int category, const char *categoryname);
|
const char *_nl_locale_name (int category, const char *categoryname);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _GETTEXT_H
|
#ifndef _GETTEXT_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* @@ end of prolog @@ */
|
/* @@ end of prolog @@ */
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
|
/* Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
|
||||||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
This program is free software; you can redistribute it and/or modify it
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* Tell glibc's <string.h> to provide a prototype for stpcpy().
|
/* Tell glibc's <string.h> to provide a prototype for stpcpy().
|
||||||
@ -67,8 +67,8 @@ static char *stpcpy (char *dest, const char *src);
|
|||||||
IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
|
IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
|
||||||
it may be concatenated to a directory pathname.
|
it may be concatenated to a directory pathname.
|
||||||
*/
|
*/
|
||||||
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
|
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
|
||||||
/* Win32, OS/2, DOS */
|
/* Win32, Cygwin, OS/2, DOS */
|
||||||
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
||||||
# define HAS_DEVICE(P) \
|
# define HAS_DEVICE(P) \
|
||||||
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
|
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
|
||||||
|
130
intl/langprefs.c
Normal file
130
intl/langprefs.c
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
/* Determine the user's language preferences.
|
||||||
|
Copyright (C) 2004-2005 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 2, 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. */
|
||||||
|
|
||||||
|
/* Written by Bruno Haible <bruno@clisp.org>. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#if HAVE_CFPREFERENCESCOPYAPPVALUE
|
||||||
|
# include <string.h>
|
||||||
|
# include <CFPreferences.h>
|
||||||
|
# include <CFPropertyList.h>
|
||||||
|
# include <CFArray.h>
|
||||||
|
# include <CFString.h>
|
||||||
|
extern void _nl_locale_name_canonicalize (char *name);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Determine the user's language preferences, as a colon separated list of
|
||||||
|
locale names in XPG syntax
|
||||||
|
language[_territory[.codeset]][@modifier]
|
||||||
|
The result must not be freed; it is statically allocated.
|
||||||
|
The LANGUAGE environment variable does not need to be considered; it is
|
||||||
|
already taken into account by the caller. */
|
||||||
|
|
||||||
|
const char *
|
||||||
|
_nl_language_preferences_default (void)
|
||||||
|
{
|
||||||
|
#if HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
|
||||||
|
{
|
||||||
|
/* Cache the preferences list, since CoreFoundation calls are expensive. */
|
||||||
|
static const char *cached_languages;
|
||||||
|
static int cache_initialized;
|
||||||
|
|
||||||
|
if (!cache_initialized)
|
||||||
|
{
|
||||||
|
CFTypeRef preferences =
|
||||||
|
CFPreferencesCopyAppValue (CFSTR ("AppleLanguages"),
|
||||||
|
kCFPreferencesCurrentApplication);
|
||||||
|
if (preferences != NULL
|
||||||
|
&& CFGetTypeID (preferences) == CFArrayGetTypeID ())
|
||||||
|
{
|
||||||
|
CFArrayRef prefArray = (CFArrayRef)preferences;
|
||||||
|
int n = CFArrayGetCount (prefArray);
|
||||||
|
char buf[256];
|
||||||
|
size_t size = 0;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < n; i++)
|
||||||
|
{
|
||||||
|
CFTypeRef element = CFArrayGetValueAtIndex (prefArray, i);
|
||||||
|
if (element != NULL
|
||||||
|
&& CFGetTypeID (element) == CFStringGetTypeID ()
|
||||||
|
&& CFStringGetCString ((CFStringRef)element,
|
||||||
|
buf, sizeof (buf),
|
||||||
|
kCFStringEncodingASCII))
|
||||||
|
{
|
||||||
|
_nl_locale_name_canonicalize (buf);
|
||||||
|
size += strlen (buf) + 1;
|
||||||
|
/* Most GNU programs use msgids in English and don't ship
|
||||||
|
an en.mo message catalog. Therefore when we see "en"
|
||||||
|
in the preferences list, arrange for gettext() to
|
||||||
|
return the msgid, and ignore all further elements of
|
||||||
|
the preferences list. */
|
||||||
|
if (strcmp (buf, "en") == 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (size > 0)
|
||||||
|
{
|
||||||
|
char *languages = (char *) malloc (size);
|
||||||
|
|
||||||
|
if (languages != NULL)
|
||||||
|
{
|
||||||
|
char *p = languages;
|
||||||
|
|
||||||
|
for (i = 0; i < n; i++)
|
||||||
|
{
|
||||||
|
CFTypeRef element =
|
||||||
|
CFArrayGetValueAtIndex (prefArray, i);
|
||||||
|
if (element != NULL
|
||||||
|
&& CFGetTypeID (element) == CFStringGetTypeID ()
|
||||||
|
&& CFStringGetCString ((CFStringRef)element,
|
||||||
|
buf, sizeof (buf),
|
||||||
|
kCFStringEncodingASCII))
|
||||||
|
{
|
||||||
|
_nl_locale_name_canonicalize (buf);
|
||||||
|
strcpy (p, buf);
|
||||||
|
p += strlen (buf);
|
||||||
|
*p++ = ':';
|
||||||
|
if (strcmp (buf, "en") == 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
*--p = '\0';
|
||||||
|
|
||||||
|
cached_languages = languages;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cache_initialized = 1;
|
||||||
|
}
|
||||||
|
if (cached_languages != NULL)
|
||||||
|
return cached_languages;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
/* Message catalogs for internationalization.
|
/* Message catalogs for internationalization.
|
||||||
Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
|
Copyright (C) 1995-1997, 2000-2004 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
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
|
under the terms of the GNU Library General Public License as published
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _LIBINTL_H
|
#ifndef _LIBINTL_H
|
||||||
@ -39,7 +39,7 @@
|
|||||||
/* Provide information about the supported file formats. Returns the
|
/* Provide information about the supported file formats. Returns the
|
||||||
maximum minor revision number supported for a given major revision. */
|
maximum minor revision number supported for a given major revision. */
|
||||||
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
|
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
|
||||||
((major) == 0 ? 1 : -1)
|
((major) == 0 || (major) == 1 ? 1 : -1)
|
||||||
|
|
||||||
/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
|
/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
|
||||||
precedence over _conio_gettext. */
|
precedence over _conio_gettext. */
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _LOADINFO_H
|
#ifndef _LOADINFO_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* Determine a canonical name for the current locale's character encoding.
|
/* Determine a canonical name for the current locale's character encoding.
|
||||||
|
|
||||||
Copyright (C) 2000-2003 Free Software Foundation, Inc.
|
Copyright (C) 2000-2004 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
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
|
under the terms of the GNU Library General Public License as published
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* Written by Bruno Haible <bruno@clisp.org>. */
|
/* Written by Bruno Haible <bruno@clisp.org>. */
|
||||||
@ -73,8 +73,8 @@
|
|||||||
# define relocate(pathname) (pathname)
|
# define relocate(pathname) (pathname)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
|
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
|
||||||
/* Win32, OS/2, DOS */
|
/* Win32, Cygwin, OS/2, DOS */
|
||||||
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -116,10 +116,16 @@ get_charset_aliases ()
|
|||||||
{
|
{
|
||||||
#if !(defined VMS || defined WIN32)
|
#if !(defined VMS || defined WIN32)
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
const char *dir = relocate (LIBDIR);
|
const char *dir;
|
||||||
const char *base = "charset.alias";
|
const char *base = "charset.alias";
|
||||||
char *file_name;
|
char *file_name;
|
||||||
|
|
||||||
|
/* Make it possible to override the charset.alias location. This is
|
||||||
|
necessary for running the testsuite before "make install". */
|
||||||
|
dir = getenv ("CHARSETALIASDIR");
|
||||||
|
if (dir == NULL || dir[0] == '\0')
|
||||||
|
dir = relocate (LIBDIR);
|
||||||
|
|
||||||
/* Concatenate dir and base into freshly allocated file_name. */
|
/* Concatenate dir and base into freshly allocated file_name. */
|
||||||
{
|
{
|
||||||
size_t dir_len = strlen (dir);
|
size_t dir_len = strlen (dir);
|
||||||
@ -141,15 +147,17 @@ get_charset_aliases ()
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Parse the file's contents. */
|
/* Parse the file's contents. */
|
||||||
int c;
|
|
||||||
char buf1[50+1];
|
|
||||||
char buf2[50+1];
|
|
||||||
char *res_ptr = NULL;
|
char *res_ptr = NULL;
|
||||||
size_t res_size = 0;
|
size_t res_size = 0;
|
||||||
size_t l1, l2;
|
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
|
int c;
|
||||||
|
char buf1[50+1];
|
||||||
|
char buf2[50+1];
|
||||||
|
size_t l1, l2;
|
||||||
|
char *old_res_ptr;
|
||||||
|
|
||||||
c = getc (fp);
|
c = getc (fp);
|
||||||
if (c == EOF)
|
if (c == EOF)
|
||||||
break;
|
break;
|
||||||
@ -170,6 +178,7 @@ get_charset_aliases ()
|
|||||||
break;
|
break;
|
||||||
l1 = strlen (buf1);
|
l1 = strlen (buf1);
|
||||||
l2 = strlen (buf2);
|
l2 = strlen (buf2);
|
||||||
|
old_res_ptr = res_ptr;
|
||||||
if (res_size == 0)
|
if (res_size == 0)
|
||||||
{
|
{
|
||||||
res_size = l1 + 1 + l2 + 1;
|
res_size = l1 + 1 + l2 + 1;
|
||||||
@ -184,6 +193,8 @@ get_charset_aliases ()
|
|||||||
{
|
{
|
||||||
/* Out of memory. */
|
/* Out of memory. */
|
||||||
res_size = 0;
|
res_size = 0;
|
||||||
|
if (old_res_ptr != NULL)
|
||||||
|
free (old_res_ptr);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
|
strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _LOCALCHARSET_H
|
#ifndef _LOCALCHARSET_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#
|
#
|
||||||
# You should have received a copy of the GNU Library General Public
|
# You should have received a copy of the GNU Library General Public
|
||||||
# License along with this program; if not, write to the Free Software
|
# License along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
# USA.
|
# USA.
|
||||||
|
|
||||||
# The format of this file is the same as for the corresponding file of
|
# The format of this file is the same as for the corresponding file of
|
||||||
@ -27,7 +27,7 @@
|
|||||||
# it with the rest of us. Send it using the `glibcbug' script to
|
# it with the rest of us. Send it using the `glibcbug' script to
|
||||||
# bugs@gnu.org.
|
# bugs@gnu.org.
|
||||||
|
|
||||||
# Packages using this file:
|
# Packages using this file:
|
||||||
|
|
||||||
bokmal nb_NO.ISO-8859-1
|
bokmal nb_NO.ISO-8859-1
|
||||||
bokmål nb_NO.ISO-8859-1
|
bokmål nb_NO.ISO-8859-1
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
||||||
|
1190
intl/localename.c
1190
intl/localename.c
File diff suppressed because it is too large
Load Diff
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* Written by Bruno Haible <bruno@clisp.org>. */
|
/* Written by Bruno Haible <bruno@clisp.org>. */
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#define OS2_AWARE
|
#define OS2_AWARE
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* When included from os2compat.h we need all the original definitions */
|
/* When included from os2compat.h we need all the original definitions */
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#if defined __EMX__
|
#if defined __EMX__
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _PLURAL_EXP_H
|
#ifndef _PLURAL_EXP_H
|
||||||
|
1719
intl/plural.c
1719
intl/plural.c
File diff suppressed because it is too large
Load Diff
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* The bison generated parser uses alloca. AIX 3 forces us to put this
|
/* The bison generated parser uses alloca. AIX 3 forces us to put this
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _PRINTF_ARGS_H
|
#ifndef _PRINTF_ARGS_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _PRINTF_PARSE_H
|
#ifndef _PRINTF_PARSE_H
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#
|
#
|
||||||
# You should have received a copy of the GNU Library General Public
|
# You should have received a copy of the GNU Library General Public
|
||||||
# License along with this program; if not, write to the Free Software
|
# License along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
# USA.
|
# USA.
|
||||||
#
|
#
|
||||||
# Written by Bruno Haible <haible@clisp.cons.org>.
|
# Written by Bruno Haible <haible@clisp.cons.org>.
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#
|
#
|
||||||
# You should have received a copy of the GNU Library General Public
|
# You should have received a copy of the GNU Library General Public
|
||||||
# License along with this program; if not, write to the Free Software
|
# License along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
# USA.
|
# USA.
|
||||||
#
|
#
|
||||||
# Written by Bruno Haible <haible@clisp.cons.org>.
|
# Written by Bruno Haible <haible@clisp.cons.org>.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* Provide relocatable packages.
|
/* Provide relocatable packages.
|
||||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
Copyright (C) 2003-2004 Free Software Foundation, Inc.
|
||||||
Written by Bruno Haible <bruno@clisp.org>, 2003.
|
Written by Bruno Haible <bruno@clisp.org>, 2003.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
This program is free software; you can redistribute it and/or modify it
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
|
|
||||||
@ -72,20 +72,20 @@
|
|||||||
ISSLASH(C) tests whether C is a directory separator character.
|
ISSLASH(C) tests whether C is a directory separator character.
|
||||||
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
|
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
|
||||||
*/
|
*/
|
||||||
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
|
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
|
||||||
/* Win32, OS/2, DOS */
|
/* Win32, Cygwin, OS/2, DOS */
|
||||||
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
||||||
# define HAS_DEVICE(P) \
|
# define HAS_DEVICE(P) \
|
||||||
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
|
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
|
||||||
&& (P)[1] == ':')
|
&& (P)[1] == ':')
|
||||||
# define IS_PATH_WITH_DIR(P) \
|
# define IS_PATH_WITH_DIR(P) \
|
||||||
(strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
|
(strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
|
||||||
# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
|
# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
|
||||||
#else
|
#else
|
||||||
/* Unix */
|
/* Unix */
|
||||||
# define ISSLASH(C) ((C) == '/')
|
# define ISSLASH(C) ((C) == '/')
|
||||||
# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
|
# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
|
||||||
# define FILESYSTEM_PREFIX_LEN(P) 0
|
# define FILE_SYSTEM_PREFIX_LEN(P) 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Original installation prefix. */
|
/* Original installation prefix. */
|
||||||
@ -189,7 +189,7 @@ compute_curr_prefix (const char *orig_installprefix,
|
|||||||
|
|
||||||
/* Determine the current installation directory. */
|
/* Determine the current installation directory. */
|
||||||
{
|
{
|
||||||
const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname);
|
const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN (curr_pathname);
|
||||||
const char *p = curr_pathname + strlen (curr_pathname);
|
const char *p = curr_pathname + strlen (curr_pathname);
|
||||||
char *q;
|
char *q;
|
||||||
|
|
||||||
@ -216,7 +216,7 @@ compute_curr_prefix (const char *orig_installprefix,
|
|||||||
const char *rp = rel_installdir + strlen (rel_installdir);
|
const char *rp = rel_installdir + strlen (rel_installdir);
|
||||||
const char *cp = curr_installdir + strlen (curr_installdir);
|
const char *cp = curr_installdir + strlen (curr_installdir);
|
||||||
const char *cp_base =
|
const char *cp_base =
|
||||||
curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
|
curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir);
|
||||||
|
|
||||||
while (rp > rel_installdir && cp > cp_base)
|
while (rp > rel_installdir && cp > cp_base)
|
||||||
{
|
{
|
||||||
@ -234,8 +234,8 @@ compute_curr_prefix (const char *orig_installprefix,
|
|||||||
same = true;
|
same = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
|
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
|
||||||
/* Win32, OS/2, DOS - case insignificant filesystem */
|
/* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */
|
||||||
if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
|
if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
|
||||||
!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
|
!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
|
||||||
break;
|
break;
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _RELOCATABLE_H
|
#ifndef _RELOCATABLE_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* vsprintf with automatic memory allocation.
|
/* vsprintf with automatic memory allocation.
|
||||||
Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
|
Copyright (C) 1999, 2002-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
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
|
under the terms of the GNU Library General Public License as published
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
|
/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
|
||||||
@ -41,7 +41,7 @@
|
|||||||
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
|
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
|
||||||
#include <string.h> /* memcpy(), strlen() */
|
#include <string.h> /* memcpy(), strlen() */
|
||||||
#include <errno.h> /* errno */
|
#include <errno.h> /* errno */
|
||||||
#include <limits.h> /* CHAR_BIT */
|
#include <limits.h> /* CHAR_BIT, INT_MAX */
|
||||||
#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
|
#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
|
||||||
#if WIDE_CHAR_VERSION
|
#if WIDE_CHAR_VERSION
|
||||||
# include "wprintf-parse.h"
|
# include "wprintf-parse.h"
|
||||||
@ -52,6 +52,11 @@
|
|||||||
/* Checked size_t computations. */
|
/* Checked size_t computations. */
|
||||||
#include "xsize.h"
|
#include "xsize.h"
|
||||||
|
|
||||||
|
/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */
|
||||||
|
#ifndef EOVERFLOW
|
||||||
|
# define EOVERFLOW E2BIG
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_WCHAR_T
|
#ifdef HAVE_WCHAR_T
|
||||||
# ifdef HAVE_WCSLEN
|
# ifdef HAVE_WCSLEN
|
||||||
# define local_wcslen wcslen
|
# define local_wcslen wcslen
|
||||||
@ -316,9 +321,8 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
|
|||||||
const CHAR_T *digitp = dp->precision_start + 1;
|
const CHAR_T *digitp = dp->precision_start + 1;
|
||||||
|
|
||||||
precision = 0;
|
precision = 0;
|
||||||
do
|
while (digitp != dp->precision_end)
|
||||||
precision = xsum (xtimes (precision, 10), *digitp++ - '0');
|
precision = xsum (xtimes (precision, 10), *digitp++ - '0');
|
||||||
while (digitp != dp->precision_end);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -864,8 +868,19 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
|
|||||||
free (buf_malloced);
|
free (buf_malloced);
|
||||||
CLEANUP ();
|
CLEANUP ();
|
||||||
*lengthp = length;
|
*lengthp = length;
|
||||||
|
if (length > INT_MAX)
|
||||||
|
goto length_overflow;
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
|
length_overflow:
|
||||||
|
/* We could produce such a big string, but its length doesn't fit into
|
||||||
|
an 'int'. POSIX says that snprintf() fails with errno = EOVERFLOW in
|
||||||
|
this case. */
|
||||||
|
if (result != resultbuf)
|
||||||
|
free (result);
|
||||||
|
errno = EOVERFLOW;
|
||||||
|
return NULL;
|
||||||
|
|
||||||
out_of_memory:
|
out_of_memory:
|
||||||
if (!(result == resultbuf || result == NULL))
|
if (!(result == resultbuf || result == NULL))
|
||||||
free (result);
|
free (result);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* vsprintf with automatic memory allocation.
|
/* vsprintf with automatic memory allocation.
|
||||||
Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
Copyright (C) 2002-2004 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
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
|
under the terms of the GNU Library General Public License as published
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _VASNPRINTF_H
|
#ifndef _VASNPRINTF_H
|
||||||
@ -48,7 +48,24 @@ extern "C" {
|
|||||||
If successful, return the address of the string (this may be = RESULTBUF
|
If successful, return the address of the string (this may be = RESULTBUF
|
||||||
if no dynamic memory allocation was necessary) and set *LENGTHP to the
|
if no dynamic memory allocation was necessary) and set *LENGTHP to the
|
||||||
number of resulting bytes, excluding the trailing NUL. Upon error, set
|
number of resulting bytes, excluding the trailing NUL. Upon error, set
|
||||||
errno and return NULL. */
|
errno and return NULL.
|
||||||
|
|
||||||
|
When dynamic memory allocation occurs, the preallocated buffer is left
|
||||||
|
alone (with possibly modified contents). This makes it possible to use
|
||||||
|
a statically allocated or stack-allocated buffer, like this:
|
||||||
|
|
||||||
|
char buf[100];
|
||||||
|
size_t len = sizeof (buf);
|
||||||
|
char *output = vasnprintf (buf, &len, format, args);
|
||||||
|
if (output == NULL)
|
||||||
|
... error handling ...;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
... use the output string ...;
|
||||||
|
if (output != buf)
|
||||||
|
free (output);
|
||||||
|
}
|
||||||
|
*/
|
||||||
extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
|
extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
|
||||||
__attribute__ ((__format__ (__printf__, 3, 4)));
|
__attribute__ ((__format__ (__printf__, 3, 4)));
|
||||||
extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
|
extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _VASNWPRINTF_H
|
#ifndef _VASNWPRINTF_H
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _WPRINTF_PARSE_H
|
#ifndef _WPRINTF_PARSE_H
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this program; if not, write to the Free Software
|
License along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||||
USA. */
|
USA. */
|
||||||
|
|
||||||
#ifndef _XSIZE_H
|
#ifndef _XSIZE_H
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# codeset.m4 serial AM1 (gettext-0.10.40)
|
# codeset.m4 serial AM1 (gettext-0.10.40)
|
||||||
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
102
m4/gettext.m4
102
m4/gettext.m4
@ -1,10 +1,8 @@
|
|||||||
# gettext.m4 serial 28 (gettext-0.13)
|
# gettext.m4 serial 37 (gettext-0.14.4)
|
||||||
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
dnl
|
dnl
|
||||||
dnl This file can can be used in projects which are not available under
|
dnl This file can can be used in projects which are not available under
|
||||||
dnl the GNU General Public License or the GNU Library General Public
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
@ -65,8 +63,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
|
|||||||
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
|
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
|
||||||
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
|
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
|
||||||
])])])])
|
])])])])
|
||||||
define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
|
define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
|
||||||
define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
|
define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
|
||||||
|
|
||||||
AC_REQUIRE([AM_PO_SUBDIRS])dnl
|
AC_REQUIRE([AM_PO_SUBDIRS])dnl
|
||||||
ifelse(gt_included_intl, yes, [
|
ifelse(gt_included_intl, yes, [
|
||||||
@ -92,6 +90,9 @@ AC_DEFUN([AM_GNU_GETTEXT],
|
|||||||
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
|
||||||
|
gt_INTL_MACOSX
|
||||||
|
|
||||||
dnl Set USE_NLS.
|
dnl Set USE_NLS.
|
||||||
AM_NLS
|
AM_NLS
|
||||||
|
|
||||||
@ -138,7 +139,7 @@ changequote([,])dnl
|
|||||||
], [])[extern int _nl_msg_cat_cntr;
|
], [])[extern int _nl_msg_cat_cntr;
|
||||||
extern int *_nl_domain_bindings;],
|
extern int *_nl_domain_bindings;],
|
||||||
[bindtextdomain ("", "");
|
[bindtextdomain ("", "");
|
||||||
return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
|
return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
|
||||||
gt_cv_func_gnugettext_libc=yes,
|
gt_cv_func_gnugettext_libc=yes,
|
||||||
gt_cv_func_gnugettext_libc=no)])
|
gt_cv_func_gnugettext_libc=no)])
|
||||||
|
|
||||||
@ -172,9 +173,9 @@ extern
|
|||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
"C"
|
"C"
|
||||||
#endif
|
#endif
|
||||||
const char *_nl_expand_alias ();],
|
const char *_nl_expand_alias (const char *);],
|
||||||
[bindtextdomain ("", "");
|
[bindtextdomain ("", "");
|
||||||
return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
|
||||||
gt_cv_func_gnugettext_libintl=yes,
|
gt_cv_func_gnugettext_libintl=yes,
|
||||||
gt_cv_func_gnugettext_libintl=no)
|
gt_cv_func_gnugettext_libintl=no)
|
||||||
dnl Now see whether libintl exists and depends on libiconv.
|
dnl Now see whether libintl exists and depends on libiconv.
|
||||||
@ -193,9 +194,9 @@ extern
|
|||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
"C"
|
"C"
|
||||||
#endif
|
#endif
|
||||||
const char *_nl_expand_alias ();],
|
const char *_nl_expand_alias (const char *);],
|
||||||
[bindtextdomain ("", "");
|
[bindtextdomain ("", "");
|
||||||
return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
|
||||||
[LIBINTL="$LIBINTL $LIBICONV"
|
[LIBINTL="$LIBINTL $LIBICONV"
|
||||||
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
||||||
gt_cv_func_gnugettext_libintl=yes
|
gt_cv_func_gnugettext_libintl=yes
|
||||||
@ -238,6 +239,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|||||||
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
CATOBJEXT=
|
||||||
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
||||||
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
||||||
dnl Mark actions to use GNU gettext tools.
|
dnl Mark actions to use GNU gettext tools.
|
||||||
@ -245,6 +247,15 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
|
if test -n "$INTL_MACOSX_LIBS"; then
|
||||||
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
||||||
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
||||||
|
dnl Some extra flags are needed during linking.
|
||||||
|
LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
|
||||||
|
LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
||||||
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
||||||
AC_DEFINE(ENABLE_NLS, 1,
|
AC_DEFINE(ENABLE_NLS, 1,
|
||||||
@ -320,6 +331,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|||||||
AC_SUBST(GENCAT)
|
AC_SUBST(GENCAT)
|
||||||
|
|
||||||
dnl For backward compatibility. Some Makefiles may be using this.
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
INTLOBJS=
|
||||||
if test "$USE_INCLUDED_LIBINTL" = yes; then
|
if test "$USE_INCLUDED_LIBINTL" = yes; then
|
||||||
INTLOBJS="\$(GETTOBJS)"
|
INTLOBJS="\$(GETTOBJS)"
|
||||||
fi
|
fi
|
||||||
@ -350,6 +362,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|||||||
AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
||||||
AC_REQUIRE([AC_PROG_CC])dnl
|
AC_REQUIRE([AC_PROG_CC])dnl
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||||
|
AC_REQUIRE([gt_GLIBC2])dnl
|
||||||
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
||||||
AC_REQUIRE([AC_ISC_POSIX])dnl
|
AC_REQUIRE([AC_ISC_POSIX])dnl
|
||||||
AC_REQUIRE([AC_HEADER_STDC])dnl
|
AC_REQUIRE([AC_HEADER_STDC])dnl
|
||||||
@ -358,22 +371,23 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|||||||
AC_REQUIRE([AC_C_INLINE])dnl
|
AC_REQUIRE([AC_C_INLINE])dnl
|
||||||
AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
||||||
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
||||||
AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
|
AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
|
||||||
AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
|
AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
|
||||||
AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
|
AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
|
||||||
AC_REQUIRE([gt_TYPE_WINT_T])dnl
|
AC_REQUIRE([gt_TYPE_WINT_T])dnl
|
||||||
AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
|
AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
|
||||||
AC_REQUIRE([jm_AC_HEADER_STDINT_H])
|
AC_REQUIRE([gl_AC_HEADER_STDINT_H])
|
||||||
AC_REQUIRE([gt_TYPE_INTMAX_T])
|
AC_REQUIRE([gt_TYPE_INTMAX_T])
|
||||||
AC_REQUIRE([gt_PRINTF_POSIX])
|
AC_REQUIRE([gt_PRINTF_POSIX])
|
||||||
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
||||||
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
||||||
AC_REQUIRE([jm_GLIBC21])dnl
|
AC_REQUIRE([gl_GLIBC21])dnl
|
||||||
AC_REQUIRE([gt_INTDIV0])dnl
|
AC_REQUIRE([gt_INTDIV0])dnl
|
||||||
AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
|
AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
|
||||||
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
|
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
|
||||||
AC_REQUIRE([gt_INTTYPES_PRI])dnl
|
AC_REQUIRE([gt_INTTYPES_PRI])dnl
|
||||||
AC_REQUIRE([gl_XSIZE])dnl
|
AC_REQUIRE([gl_XSIZE])dnl
|
||||||
|
AC_REQUIRE([gt_INTL_MACOSX])dnl
|
||||||
|
|
||||||
AC_CHECK_TYPE([ptrdiff_t], ,
|
AC_CHECK_TYPE([ptrdiff_t], ,
|
||||||
[AC_DEFINE([ptrdiff_t], [long],
|
[AC_DEFINE([ptrdiff_t], [long],
|
||||||
@ -427,7 +441,11 @@ __fsetlocking])
|
|||||||
AM_ICONV
|
AM_ICONV
|
||||||
AM_LANGINFO_CODESET
|
AM_LANGINFO_CODESET
|
||||||
if test $ac_cv_header_locale_h = yes; then
|
if test $ac_cv_header_locale_h = yes; then
|
||||||
AM_LC_MESSAGES
|
gt_LC_MESSAGES
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -n "$INTL_MACOSX_LIBS"; then
|
||||||
|
CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
|
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
|
||||||
@ -463,6 +481,50 @@ changequote([,])dnl
|
|||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl Checks for special options needed on MacOS X.
|
||||||
|
dnl Defines INTL_MACOSX_LIBS.
|
||||||
|
AC_DEFUN([gt_INTL_MACOSX],
|
||||||
|
[
|
||||||
|
dnl Check for API introduced in MacOS X 10.2.
|
||||||
|
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
|
||||||
|
gt_cv_func_CFPreferencesCopyAppValue,
|
||||||
|
[gt_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
||||||
|
gt_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS -framework CoreFoundation"
|
||||||
|
AC_TRY_LINK([#include <CFPreferences.h>],
|
||||||
|
[CFPreferencesCopyAppValue(NULL, NULL)],
|
||||||
|
[gt_cv_func_CFPreferencesCopyAppValue=yes],
|
||||||
|
[gt_cv_func_CFPreferencesCopyAppValue=no])
|
||||||
|
CPPFLAGS="$gt_save_CPPFLAGS"
|
||||||
|
LIBS="$gt_save_LIBS"])
|
||||||
|
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
|
||||||
|
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
|
||||||
|
[Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
|
||||||
|
fi
|
||||||
|
dnl Check for API introduced in MacOS X 10.3.
|
||||||
|
AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
|
||||||
|
[gt_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
||||||
|
gt_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS -framework CoreFoundation"
|
||||||
|
AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
|
||||||
|
[gt_cv_func_CFLocaleCopyCurrent=yes],
|
||||||
|
[gt_cv_func_CFLocaleCopyCurrent=no])
|
||||||
|
CPPFLAGS="$gt_save_CPPFLAGS"
|
||||||
|
LIBS="$gt_save_LIBS"])
|
||||||
|
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
|
||||||
|
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
|
||||||
|
[Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
|
||||||
|
fi
|
||||||
|
INTL_MACOSX_LIBS=
|
||||||
|
if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
|
||||||
|
INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
|
||||||
|
fi
|
||||||
|
AC_SUBST([INTL_MACOSX_LIBS])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
dnl gt_CHECK_DECL(FUNC, INCLUDES)
|
dnl gt_CHECK_DECL(FUNC, INCLUDES)
|
||||||
dnl Check whether a function is declared.
|
dnl Check whether a function is declared.
|
||||||
AC_DEFUN([gt_CHECK_DECL],
|
AC_DEFUN([gt_CHECK_DECL],
|
||||||
|
30
m4/glibc2.m4
Normal file
30
m4/glibc2.m4
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# glibc2.m4 serial 1
|
||||||
|
dnl Copyright (C) 2000-2002, 2004 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.
|
||||||
|
|
||||||
|
# Test for the GNU C Library, version 2.0 or newer.
|
||||||
|
# From Bruno Haible.
|
||||||
|
|
||||||
|
AC_DEFUN([gt_GLIBC2],
|
||||||
|
[
|
||||||
|
AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
|
||||||
|
ac_cv_gnu_library_2,
|
||||||
|
[AC_EGREP_CPP([Lucky GNU user],
|
||||||
|
[
|
||||||
|
#include <features.h>
|
||||||
|
#ifdef __GNU_LIBRARY__
|
||||||
|
#if (__GLIBC__ >= 2)
|
||||||
|
Lucky GNU user
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
],
|
||||||
|
ac_cv_gnu_library_2=yes,
|
||||||
|
ac_cv_gnu_library_2=no)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
AC_SUBST(GLIBC2)
|
||||||
|
GLIBC2="$ac_cv_gnu_library_2"
|
||||||
|
]
|
||||||
|
)
|
@ -1,15 +1,13 @@
|
|||||||
# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
|
# glibc21.m4 serial 3
|
||||||
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
# Test for the GNU C Library, version 2.1 or newer.
|
# Test for the GNU C Library, version 2.1 or newer.
|
||||||
# From Bruno Haible.
|
# From Bruno Haible.
|
||||||
|
|
||||||
AC_DEFUN([jm_GLIBC21],
|
AC_DEFUN([gl_GLIBC21],
|
||||||
[
|
[
|
||||||
AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
|
AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
|
||||||
ac_cv_gnu_library_2_1,
|
ac_cv_gnu_library_2_1,
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# iconv.m4 serial AM4 (gettext-0.11.3)
|
# iconv.m4 serial AM4 (gettext-0.11.3)
|
||||||
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# intdiv0.m4 serial 1 (gettext-0.11.3)
|
# intdiv0.m4 serial 1 (gettext-0.11.3)
|
||||||
dnl Copyright (C) 2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 2002 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
16
m4/intmax.m4
16
m4/intmax.m4
@ -1,10 +1,8 @@
|
|||||||
# intmax.m4 serial 1 (gettext-0.12)
|
# intmax.m4 serial 2 (gettext-0.14.2)
|
||||||
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
dnl Test whether the system has the 'intmax_t' type, but don't attempt to
|
dnl Test whether the system has the 'intmax_t' type, but don't attempt to
|
||||||
@ -12,8 +10,8 @@ dnl find a replacement if it is lacking.
|
|||||||
|
|
||||||
AC_DEFUN([gt_TYPE_INTMAX_T],
|
AC_DEFUN([gt_TYPE_INTMAX_T],
|
||||||
[
|
[
|
||||||
AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
|
AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
|
||||||
AC_REQUIRE([jm_AC_HEADER_STDINT_H])
|
AC_REQUIRE([gl_AC_HEADER_STDINT_H])
|
||||||
AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
|
AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
|
||||||
[AC_TRY_COMPILE([
|
[AC_TRY_COMPILE([
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
|
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
|
||||||
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# inttypes.m4 serial 1 (gettext-0.11.4)
|
# inttypes.m4 serial 1 (gettext-0.11.4)
|
||||||
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Paul Eggert.
|
dnl From Paul Eggert.
|
||||||
|
|
||||||
|
@ -1,26 +1,24 @@
|
|||||||
# inttypes_h.m4 serial 5 (gettext-0.12)
|
# inttypes_h.m4 serial 6
|
||||||
dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Paul Eggert.
|
dnl From Paul Eggert.
|
||||||
|
|
||||||
# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
|
# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
|
||||||
# doesn't clash with <sys/types.h>, and declares uintmax_t.
|
# doesn't clash with <sys/types.h>, and declares uintmax_t.
|
||||||
|
|
||||||
AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
|
AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
|
||||||
[
|
[
|
||||||
AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
|
AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
|
||||||
[AC_TRY_COMPILE(
|
[AC_TRY_COMPILE(
|
||||||
[#include <sys/types.h>
|
[#include <sys/types.h>
|
||||||
#include <inttypes.h>],
|
#include <inttypes.h>],
|
||||||
[uintmax_t i = (uintmax_t) -1;],
|
[uintmax_t i = (uintmax_t) -1;],
|
||||||
jm_ac_cv_header_inttypes_h=yes,
|
gl_cv_header_inttypes_h=yes,
|
||||||
jm_ac_cv_header_inttypes_h=no)])
|
gl_cv_header_inttypes_h=no)])
|
||||||
if test $jm_ac_cv_header_inttypes_h = yes; then
|
if test $gl_cv_header_inttypes_h = yes; then
|
||||||
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
|
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
|
||||||
[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
|
[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
|
||||||
and declares uintmax_t. ])
|
and declares uintmax_t. ])
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# isc-posix.m4 serial 2 (gettext-0.11.2)
|
# isc-posix.m4 serial 2 (gettext-0.11.2)
|
||||||
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
|
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
|
||||||
|
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# lcmessage.m4 serial 3 (gettext-0.11.3)
|
# lcmessage.m4 serial 4 (gettext-0.14.2)
|
||||||
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
dnl
|
dnl
|
||||||
dnl This file can can be used in projects which are not available under
|
dnl This file can can be used in projects which are not available under
|
||||||
dnl the GNU General Public License or the GNU Library General Public
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
@ -20,12 +18,12 @@ dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|||||||
|
|
||||||
# Check whether LC_MESSAGES is available in <locale.h>.
|
# Check whether LC_MESSAGES is available in <locale.h>.
|
||||||
|
|
||||||
AC_DEFUN([AM_LC_MESSAGES],
|
AC_DEFUN([gt_LC_MESSAGES],
|
||||||
[
|
[
|
||||||
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
|
AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
|
||||||
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
||||||
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
|
gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
|
||||||
if test $am_cv_val_LC_MESSAGES = yes; then
|
if test $gt_cv_val_LC_MESSAGES = yes; then
|
||||||
AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
||||||
[Define if your <locale.h> file defines LC_MESSAGES.])
|
[Define if your <locale.h> file defines LC_MESSAGES.])
|
||||||
fi
|
fi
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# lib-ld.m4 serial 3 (gettext-0.13)
|
# lib-ld.m4 serial 3 (gettext-0.13)
|
||||||
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl Subroutines of libtool.m4,
|
dnl Subroutines of libtool.m4,
|
||||||
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
# lib-link.m4 serial 4 (gettext-0.12)
|
# lib-link.m4 serial 6 (gettext-0.14.3)
|
||||||
dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
AC_PREREQ(2.50)
|
||||||
|
|
||||||
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
||||||
dnl the libraries corresponding to explicit and implicit dependencies.
|
dnl the libraries corresponding to explicit and implicit dependencies.
|
||||||
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
|
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
|
||||||
@ -95,6 +95,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
|
|||||||
dnl hardcode_direct, hardcode_minus_L.
|
dnl hardcode_direct, hardcode_minus_L.
|
||||||
AC_DEFUN([AC_LIB_RPATH],
|
AC_DEFUN([AC_LIB_RPATH],
|
||||||
[
|
[
|
||||||
|
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
|
||||||
|
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
|
||||||
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
||||||
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
||||||
@ -350,7 +352,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|||||||
if test "X$additional_includedir" = "X/usr/local/include"; then
|
if test "X$additional_includedir" = "X/usr/local/include"; then
|
||||||
if test -n "$GCC"; then
|
if test -n "$GCC"; then
|
||||||
case $host_os in
|
case $host_os in
|
||||||
linux*) haveit=yes;;
|
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -399,7 +401,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|||||||
if test "X$additional_libdir" = "X/usr/local/lib"; then
|
if test "X$additional_libdir" = "X/usr/local/lib"; then
|
||||||
if test -n "$GCC"; then
|
if test -n "$GCC"; then
|
||||||
case $host_os in
|
case $host_os in
|
||||||
linux*) haveit=yes;;
|
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# lib-prefix.m4 serial 3 (gettext-0.13)
|
# lib-prefix.m4 serial 4 (gettext-0.14.2)
|
||||||
dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
@ -71,7 +69,7 @@ AC_DEFUN([AC_LIB_PREFIX],
|
|||||||
if test "X$additional_includedir" = "X/usr/local/include"; then
|
if test "X$additional_includedir" = "X/usr/local/include"; then
|
||||||
if test -n "$GCC"; then
|
if test -n "$GCC"; then
|
||||||
case $host_os in
|
case $host_os in
|
||||||
linux*) haveit=yes;;
|
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# longdouble.m4 serial 1 (gettext-0.12)
|
# longdouble.m4 serial 1 (gettext-0.12)
|
||||||
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
dnl Test whether the compiler supports the 'long double' type.
|
dnl Test whether the compiler supports the 'long double' type.
|
||||||
|
@ -1,16 +1,14 @@
|
|||||||
# longlong.m4 serial 4
|
# longlong.m4 serial 5
|
||||||
dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Paul Eggert.
|
dnl From Paul Eggert.
|
||||||
|
|
||||||
# Define HAVE_LONG_LONG if 'long long' works.
|
# Define HAVE_LONG_LONG if 'long long' works.
|
||||||
|
|
||||||
AC_DEFUN([jm_AC_TYPE_LONG_LONG],
|
AC_DEFUN([gl_AC_TYPE_LONG_LONG],
|
||||||
[
|
[
|
||||||
AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
|
AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
|
||||||
[AC_TRY_LINK([long long ll = 1LL; int i = 63;],
|
[AC_TRY_LINK([long long ll = 1LL; int i = 63;],
|
||||||
|
16
m4/nls.m4
16
m4/nls.m4
@ -1,10 +1,8 @@
|
|||||||
# nls.m4 serial 1 (gettext-0.12)
|
# nls.m4 serial 2 (gettext-0.14.3)
|
||||||
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
dnl
|
dnl
|
||||||
dnl This file can can be used in projects which are not available under
|
dnl This file can can be used in projects which are not available under
|
||||||
dnl the GNU General Public License or the GNU Library General Public
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
@ -19,6 +17,8 @@ dnl Authors:
|
|||||||
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
||||||
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
||||||
|
|
||||||
|
AC_PREREQ(2.50)
|
||||||
|
|
||||||
AC_DEFUN([AM_NLS],
|
AC_DEFUN([AM_NLS],
|
||||||
[
|
[
|
||||||
AC_MSG_CHECKING([whether NLS is requested])
|
AC_MSG_CHECKING([whether NLS is requested])
|
||||||
@ -32,6 +32,8 @@ AC_DEFUN([AM_NLS],
|
|||||||
|
|
||||||
AC_DEFUN([AM_MKINSTALLDIRS],
|
AC_DEFUN([AM_MKINSTALLDIRS],
|
||||||
[
|
[
|
||||||
|
dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
|
||||||
|
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
|
||||||
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
||||||
dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
|
dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
|
||||||
dnl Try to locate it.
|
dnl Try to locate it.
|
||||||
|
33
m4/po.m4
33
m4/po.m4
@ -1,10 +1,8 @@
|
|||||||
# po.m4 serial 3 (gettext-0.14)
|
# po.m4 serial 7 (gettext-0.14.3)
|
||||||
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
dnl
|
dnl
|
||||||
dnl This file can can be used in projects which are not available under
|
dnl This file can can be used in projects which are not available under
|
||||||
dnl the GNU General Public License or the GNU Library General Public
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
@ -19,6 +17,8 @@ dnl Authors:
|
|||||||
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
||||||
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
||||||
|
|
||||||
|
AC_PREREQ(2.50)
|
||||||
|
|
||||||
dnl Checks for all prerequisites of the po subdirectory.
|
dnl Checks for all prerequisites of the po subdirectory.
|
||||||
AC_DEFUN([AM_PO_SUBDIRS],
|
AC_DEFUN([AM_PO_SUBDIRS],
|
||||||
[
|
[
|
||||||
@ -34,7 +34,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|||||||
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
|
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
|
||||||
dnl The second test excludes FreeBSD msgfmt.
|
dnl The second test excludes FreeBSD msgfmt.
|
||||||
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
||||||
[$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
|
[$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
|
||||||
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
||||||
:)
|
:)
|
||||||
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
||||||
@ -43,7 +43,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|||||||
dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
|
dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
|
||||||
dnl The second test excludes FreeBSD xgettext.
|
dnl The second test excludes FreeBSD xgettext.
|
||||||
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||||
[$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
|
[$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
|
||||||
(if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
(if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
||||||
:)
|
:)
|
||||||
dnl Remove leftover from FreeBSD xgettext call.
|
dnl Remove leftover from FreeBSD xgettext call.
|
||||||
@ -51,7 +51,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|||||||
|
|
||||||
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
|
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
|
||||||
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
|
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
|
||||||
[$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
|
[$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
|
||||||
|
|
||||||
dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
||||||
dnl Test whether we really found GNU msgfmt.
|
dnl Test whether we really found GNU msgfmt.
|
||||||
@ -106,6 +106,9 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|||||||
/*) top_srcdir="$ac_given_srcdir" ;;
|
/*) top_srcdir="$ac_given_srcdir" ;;
|
||||||
*) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
*) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
||||||
esac
|
esac
|
||||||
|
# Treat a directory as a PO directory if and only if it has a
|
||||||
|
# POTFILES.in file. This allows packages to have multiple PO
|
||||||
|
# directories under different names or in different locations.
|
||||||
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
||||||
rm -f "$ac_dir/POTFILES"
|
rm -f "$ac_dir/POTFILES"
|
||||||
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
|
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
|
||||||
@ -119,7 +122,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|||||||
if test -n "$OBSOLETE_ALL_LINGUAS"; then
|
if test -n "$OBSOLETE_ALL_LINGUAS"; then
|
||||||
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
||||||
fi
|
fi
|
||||||
ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
||||||
# Hide the ALL_LINGUAS assigment from automake.
|
# Hide the ALL_LINGUAS assigment from automake.
|
||||||
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
||||||
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
|
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
|
||||||
@ -298,7 +301,7 @@ changequote([,])dnl
|
|||||||
fi
|
fi
|
||||||
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
||||||
# The LINGUAS file contains the set of available languages.
|
# The LINGUAS file contains the set of available languages.
|
||||||
ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
||||||
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
|
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
|
||||||
else
|
else
|
||||||
# Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
|
# Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
|
||||||
@ -348,7 +351,7 @@ changequote([,])dnl
|
|||||||
QMFILES="$QMFILES $srcdirpre$lang.qm"
|
QMFILES="$QMFILES $srcdirpre$lang.qm"
|
||||||
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
||||||
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
|
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
|
||||||
frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
||||||
RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
|
RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
|
||||||
done
|
done
|
||||||
# CATALOGS depends on both $ac_dir and the user's LINGUAS
|
# CATALOGS depends on both $ac_dir and the user's LINGUAS
|
||||||
@ -389,7 +392,7 @@ changequote([,])dnl
|
|||||||
QTCATALOGS="$QTCATALOGS $lang.qm"
|
QTCATALOGS="$QTCATALOGS $lang.qm"
|
||||||
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
||||||
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
|
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
|
||||||
frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
||||||
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
|
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
@ -409,7 +412,7 @@ EOF
|
|||||||
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
|
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
|
||||||
# Add dependencies that cannot be formulated as a simple suffix rule.
|
# Add dependencies that cannot be formulated as a simple suffix rule.
|
||||||
for lang in $ALL_LINGUAS; do
|
for lang in $ALL_LINGUAS; do
|
||||||
frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
||||||
cat >> "$ac_file.tmp" <<EOF
|
cat >> "$ac_file.tmp" <<EOF
|
||||||
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
|
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
|
||||||
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
|
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# printf-posix.m4 serial 2 (gettext-0.13.1)
|
# printf-posix.m4 serial 2 (gettext-0.13.1)
|
||||||
dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
dnl Test whether the printf() function supports POSIX/XSI format strings with
|
dnl Test whether the printf() function supports POSIX/XSI format strings with
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# progtest.m4 serial 3 (gettext-0.12)
|
# progtest.m4 serial 4 (gettext-0.14.2)
|
||||||
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
dnl
|
dnl
|
||||||
dnl This file can can be used in projects which are not available under
|
dnl This file can can be used in projects which are not available under
|
||||||
dnl the GNU General Public License or the GNU Library General Public
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
@ -18,6 +16,8 @@ dnl They are *not* in the public domain.
|
|||||||
dnl Authors:
|
dnl Authors:
|
||||||
dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
|
||||||
|
|
||||||
|
AC_PREREQ(2.50)
|
||||||
|
|
||||||
# Search path for a program which passes the given test.
|
# Search path for a program which passes the given test.
|
||||||
|
|
||||||
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
||||||
@ -67,6 +67,7 @@ AC_CACHE_VAL(ac_cv_path_$1,
|
|||||||
test -z "$ac_dir" && ac_dir=.
|
test -z "$ac_dir" && ac_dir=.
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
|
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
|
||||||
|
echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
|
||||||
if [$3]; then
|
if [$3]; then
|
||||||
ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
|
ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
|
||||||
break 2
|
break 2
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# signed.m4 serial 1 (gettext-0.10.40)
|
# signed.m4 serial 1 (gettext-0.10.40)
|
||||||
dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
|
dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# size_max.m4 serial 2
|
# size_max.m4 serial 2
|
||||||
dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
@ -1,26 +1,24 @@
|
|||||||
# stdint_h.m4 serial 3 (gettext-0.12)
|
# stdint_h.m4 serial 5
|
||||||
dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Paul Eggert.
|
dnl From Paul Eggert.
|
||||||
|
|
||||||
# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
|
# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
|
||||||
# doesn't clash with <sys/types.h>, and declares uintmax_t.
|
# doesn't clash with <sys/types.h>, and declares uintmax_t.
|
||||||
|
|
||||||
AC_DEFUN([jm_AC_HEADER_STDINT_H],
|
AC_DEFUN([gl_AC_HEADER_STDINT_H],
|
||||||
[
|
[
|
||||||
AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
|
AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
|
||||||
[AC_TRY_COMPILE(
|
[AC_TRY_COMPILE(
|
||||||
[#include <sys/types.h>
|
[#include <sys/types.h>
|
||||||
#include <stdint.h>],
|
#include <stdint.h>],
|
||||||
[uintmax_t i = (uintmax_t) -1;],
|
[uintmax_t i = (uintmax_t) -1;],
|
||||||
jm_ac_cv_header_stdint_h=yes,
|
gl_cv_header_stdint_h=yes,
|
||||||
jm_ac_cv_header_stdint_h=no)])
|
gl_cv_header_stdint_h=no)])
|
||||||
if test $jm_ac_cv_header_stdint_h = yes; then
|
if test $gl_cv_header_stdint_h = yes; then
|
||||||
AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
|
AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
|
||||||
[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
|
[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
|
||||||
and declares uintmax_t. ])
|
and declares uintmax_t. ])
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# uintmax_t.m4 serial 7 (gettext-0.12)
|
# uintmax_t.m4 serial 9
|
||||||
dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Paul Eggert.
|
dnl From Paul Eggert.
|
||||||
|
|
||||||
@ -13,12 +11,12 @@ AC_PREREQ(2.13)
|
|||||||
# Define uintmax_t to 'unsigned long' or 'unsigned long long'
|
# Define uintmax_t to 'unsigned long' or 'unsigned long long'
|
||||||
# if it is not already defined in <stdint.h> or <inttypes.h>.
|
# if it is not already defined in <stdint.h> or <inttypes.h>.
|
||||||
|
|
||||||
AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
|
AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
|
||||||
[
|
[
|
||||||
AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
|
AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
|
||||||
AC_REQUIRE([jm_AC_HEADER_STDINT_H])
|
AC_REQUIRE([gl_AC_HEADER_STDINT_H])
|
||||||
if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
|
if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
|
||||||
AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
|
AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
|
||||||
test $ac_cv_type_unsigned_long_long = yes \
|
test $ac_cv_type_unsigned_long_long = yes \
|
||||||
&& ac_type='unsigned long long' \
|
&& ac_type='unsigned long long' \
|
||||||
|| ac_type='unsigned long'
|
|| ac_type='unsigned long'
|
||||||
|
@ -1,16 +1,14 @@
|
|||||||
# ulonglong.m4 serial 3
|
# ulonglong.m4 serial 4
|
||||||
dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Paul Eggert.
|
dnl From Paul Eggert.
|
||||||
|
|
||||||
# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
|
# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
|
||||||
|
|
||||||
AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
|
AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
|
||||||
[
|
[
|
||||||
AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
|
AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
|
||||||
[AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
|
[AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# wchar_t.m4 serial 1 (gettext-0.12)
|
# wchar_t.m4 serial 1 (gettext-0.12)
|
||||||
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
dnl Test whether <stddef.h> has the 'wchar_t' type.
|
dnl Test whether <stddef.h> has the 'wchar_t' type.
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
# wint_t.m4 serial 1 (gettext-0.12)
|
# wint_t.m4 serial 1 (gettext-0.12)
|
||||||
dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
dnl From Bruno Haible.
|
||||||
dnl Test whether <wchar.h> has the 'wint_t' type.
|
dnl Test whether <wchar.h> has the 'wint_t' type.
|
||||||
|
13
m4/xsize.m4
13
m4/xsize.m4
@ -1,14 +1,13 @@
|
|||||||
# xsize.m4 serial 2
|
# xsize.m4 serial 3
|
||||||
dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl General Public License. As a special exception to the GNU General
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl Public License, this file may be distributed as part of a program
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
AC_DEFUN([gl_XSIZE],
|
AC_DEFUN([gl_XSIZE],
|
||||||
[
|
[
|
||||||
dnl Prerequisites of lib/xsize.h.
|
dnl Prerequisites of lib/xsize.h.
|
||||||
AC_REQUIRE([gl_SIZE_MAX])
|
AC_REQUIRE([gl_SIZE_MAX])
|
||||||
|
AC_REQUIRE([AC_C_INLINE])
|
||||||
AC_CHECK_HEADERS(stdint.h)
|
AC_CHECK_HEADERS(stdint.h)
|
||||||
])
|
])
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Makefile for PO directory in any package using GNU gettext.
|
# Makefile for PO directory in any package using GNU gettext.
|
||||||
# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
||||||
#
|
#
|
||||||
# This file can be copied and used freely without restrictions. It can
|
# This file can be copied and used freely without restrictions. It can
|
||||||
# be used in projects which are not available under the GNU General Public
|
# be used in projects which are not available under the GNU General Public
|
||||||
@ -8,10 +8,11 @@
|
|||||||
# Please note that the actual code of GNU gettext is covered by the GNU
|
# Please note that the actual code of GNU gettext is covered by the GNU
|
||||||
# General Public License and is *not* in the public domain.
|
# General Public License and is *not* in the public domain.
|
||||||
#
|
#
|
||||||
# Origin: gettext-0.14
|
# Origin: gettext-0.14.4
|
||||||
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
|
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
@ -32,7 +33,6 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||||||
MKINSTALLDIRS = @MKINSTALLDIRS@
|
MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||||
mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
|
mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
|
||||||
|
|
||||||
AWK = @AWK@
|
|
||||||
|
|
||||||
GMSGFMT = @GMSGFMT@
|
GMSGFMT = @GMSGFMT@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
@ -49,11 +49,11 @@ UPDATEPOFILES = @UPDATEPOFILES@
|
|||||||
DUMMYPOFILES = @DUMMYPOFILES@
|
DUMMYPOFILES = @DUMMYPOFILES@
|
||||||
DISTFILES.common = Makefile.in.in remove-potcdate.sin \
|
DISTFILES.common = Makefile.in.in remove-potcdate.sin \
|
||||||
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
|
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
|
||||||
DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
|
DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
|
||||||
$(POFILES) $(GMOFILES) \
|
$(POFILES) $(GMOFILES) \
|
||||||
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
|
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
|
||||||
|
|
||||||
DISTFILES.extra1 = lyx_pot.py
|
DISTFILES.extra1 = lyx_pot.py postats.sh pocheck.pl
|
||||||
|
|
||||||
POTFILE_IN_DEPS = $(shell find $(top_srcdir)/src -name Makefile.am)
|
POTFILE_IN_DEPS = $(shell find $(top_srcdir)/src -name Makefile.am)
|
||||||
|
|
||||||
@ -86,6 +86,12 @@ all: all-@USE_NLS@
|
|||||||
all-yes: stamp-po
|
all-yes: stamp-po
|
||||||
all-no:
|
all-no:
|
||||||
|
|
||||||
|
# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
|
||||||
|
# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
|
||||||
|
# we don't want to bother translators with empty POT files). We assume that
|
||||||
|
# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
|
||||||
|
# In this case, stamp-po is a nop (i.e. a phony target).
|
||||||
|
|
||||||
# stamp-po is a timestamp denoting the last time at which the CATALOGS have
|
# stamp-po is a timestamp denoting the last time at which the CATALOGS have
|
||||||
# been loosely updated. Its purpose is that when a developer or translator
|
# been loosely updated. Its purpose is that when a developer or translator
|
||||||
# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
|
# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
|
||||||
@ -95,10 +101,13 @@ all-no:
|
|||||||
# $(POFILES) has been designed to not touch files that don't need to be
|
# $(POFILES) has been designed to not touch files that don't need to be
|
||||||
# changed.
|
# changed.
|
||||||
stamp-po: $(srcdir)/$(DOMAIN).pot
|
stamp-po: $(srcdir)/$(DOMAIN).pot
|
||||||
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
|
test ! -f $(srcdir)/$(DOMAIN).pot || \
|
||||||
@echo "touch stamp-po"
|
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
|
||||||
@echo timestamp > stamp-poT
|
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
|
||||||
@mv stamp-poT stamp-po
|
echo "touch stamp-po" && \
|
||||||
|
echo timestamp > stamp-poT && \
|
||||||
|
mv stamp-poT stamp-po; \
|
||||||
|
}
|
||||||
|
|
||||||
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
|
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
|
||||||
# otherwise packages like GCC can not be built if only parts of the source
|
# otherwise packages like GCC can not be built if only parts of the source
|
||||||
@ -108,11 +117,16 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
|
|||||||
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
|
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
|
||||||
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
||||||
$(MAKE) l10n_pots
|
$(MAKE) l10n_pots
|
||||||
|
if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
|
||||||
|
msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
|
||||||
|
else \
|
||||||
|
msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
|
||||||
|
fi; \
|
||||||
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
|
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
|
||||||
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
|
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
|
||||||
--files-from=$(srcdir)/POTFILES.in \
|
--files-from=$(srcdir)/POTFILES.in \
|
||||||
--copyright-holder='$(COPYRIGHT_HOLDER)' \
|
--copyright-holder='$(COPYRIGHT_HOLDER)' \
|
||||||
--msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
|
--msgid-bugs-address="$$msgid_bugs_address"
|
||||||
test ! -f $(DOMAIN).po || { \
|
test ! -f $(DOMAIN).po || { \
|
||||||
if test -f $(srcdir)/$(DOMAIN).pot; then \
|
if test -f $(srcdir)/$(DOMAIN).pot; then \
|
||||||
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
|
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
|
||||||
@ -297,11 +311,14 @@ dist distdir:
|
|||||||
$(MAKE) update-po
|
$(MAKE) update-po
|
||||||
@$(MAKE) dist2
|
@$(MAKE) dist2
|
||||||
# This is a separate target because 'update-po' must be executed before.
|
# This is a separate target because 'update-po' must be executed before.
|
||||||
dist2: $(DISTFILES)
|
dist2: stamp-po $(DISTFILES)
|
||||||
dists="$(DISTFILES)"; \
|
dists="$(DISTFILES)"; \
|
||||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||||
dists="$$dists Makevars.template"; \
|
dists="$$dists Makevars.template"; \
|
||||||
fi; \
|
fi; \
|
||||||
|
if test -f $(srcdir)/$(DOMAIN).pot; then \
|
||||||
|
dists="$$dists $(DOMAIN).pot stamp-po"; \
|
||||||
|
fi; \
|
||||||
if test -f $(srcdir)/ChangeLog; then \
|
if test -f $(srcdir)/ChangeLog; then \
|
||||||
dists="$$dists ChangeLog"; \
|
dists="$$dists ChangeLog"; \
|
||||||
fi; \
|
fi; \
|
||||||
@ -313,9 +330,9 @@ dist2: $(DISTFILES)
|
|||||||
if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
|
if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
|
||||||
for file in $$dists; do \
|
for file in $$dists; do \
|
||||||
if test -f $$file; then \
|
if test -f $$file; then \
|
||||||
cp -p $$file $(distdir); \
|
cp -p $$file $(distdir) || exit 1; \
|
||||||
else \
|
else \
|
||||||
cp -p $(srcdir)/$$file $(distdir); \
|
cp -p $(srcdir)/$$file $(distdir) || exit 1; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -362,7 +379,7 @@ $(DUMMYPOFILES):
|
|||||||
update-gmo: Makefile $(GMOFILES)
|
update-gmo: Makefile $(GMOFILES)
|
||||||
@:
|
@:
|
||||||
|
|
||||||
Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
|
Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
|
||||||
cd $(top_builddir) \
|
cd $(top_builddir) \
|
||||||
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
|
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
|
||||||
$(SHELL) ./config.status
|
$(SHELL) ./config.status
|
||||||
|
41
po/Makevars.template
Normal file
41
po/Makevars.template
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
# Makefile variables for PO directory in any package using GNU gettext.
|
||||||
|
|
||||||
|
# Usually the message domain is the same as the package name.
|
||||||
|
DOMAIN = $(PACKAGE)
|
||||||
|
|
||||||
|
# These two variables depend on the location of this directory.
|
||||||
|
subdir = po
|
||||||
|
top_builddir = ..
|
||||||
|
|
||||||
|
# These options get passed to xgettext.
|
||||||
|
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
|
||||||
|
|
||||||
|
# This is the copyright holder that gets inserted into the header of the
|
||||||
|
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
|
||||||
|
# package. (Note that the msgstr strings, extracted from the package's
|
||||||
|
# sources, belong to the copyright holder of the package.) Translators are
|
||||||
|
# expected to transfer the copyright for their translations to this person
|
||||||
|
# or entity, or to disclaim their copyright. The empty string stands for
|
||||||
|
# the public domain; in this case the translators are expected to disclaim
|
||||||
|
# their copyright.
|
||||||
|
COPYRIGHT_HOLDER = Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
# This is the email address or URL to which the translators shall report
|
||||||
|
# bugs in the untranslated strings:
|
||||||
|
# - Strings which are not entire sentences, see the maintainer guidelines
|
||||||
|
# in the GNU gettext documentation, section 'Preparing Strings'.
|
||||||
|
# - Strings which use unclear terms or require additional context to be
|
||||||
|
# understood.
|
||||||
|
# - Strings which make invalid assumptions about notation of date, time or
|
||||||
|
# money.
|
||||||
|
# - Pluralisation problems.
|
||||||
|
# - Incorrect English spelling.
|
||||||
|
# - Incorrect formatting.
|
||||||
|
# It can be your email address, or a mailing list address where translators
|
||||||
|
# can write to without being subscribed, or the URL of a web page through
|
||||||
|
# which the translators can contact you.
|
||||||
|
MSGID_BUGS_ADDRESS =
|
||||||
|
|
||||||
|
# This is the list of locale categories, beyond LC_MESSAGES, for which the
|
||||||
|
# message catalogs shall be used. It is usually empty.
|
||||||
|
EXTRA_LOCALE_CATEGORIES =
|
@ -51,3 +51,4 @@ What's new
|
|||||||
chkconfig.ltx to the user dir using default permissions (thus avoiding a
|
chkconfig.ltx to the user dir using default permissions (thus avoiding a
|
||||||
bug on Cygwin where python doesn't copy ACLs associated to a file).
|
bug on Cygwin where python doesn't copy ACLs associated to a file).
|
||||||
|
|
||||||
|
- Upgrade to gettext 0.14.6.
|
||||||
|
Loading…
Reference in New Issue
Block a user