ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to Gettext 0.11.5. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1265 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Jordi Mallach 2002-08-21 18:19:53 +00:00
parent 0341b58c05
commit 1f1022faaa
16 changed files with 554 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

340
ABOUT-NLS
View File

@ -171,202 +171,232 @@ Available Packages
================== ==================
Languages are not equally supported in all packages. The following Languages are not equally supported in all packages. The following
matrix shows the current state of internationalization, as of April matrix shows the current state of internationalization, as of August
2002. The matrix shows, in regard of each package, for which languages 2002. The matrix shows, in regard of each package, for which languages
PO files have been submitted to translation coordination, with a PO files have been submitted to translation coordination, with a
translation percentage of at least 50%. translation percentage of at least 50%.
Ready PO files bg ca cs da de el en eo es et fi fr Ready PO files be bg ca cs da de el en eo es et fi fr
+-------------------------------------+ +----------------------------------------+
a2ps | [] [] [] [] | a2ps | [] [] [] [] |
bash | [] [] [] [] | ap-utils | |
bfd | [] [] | bash | [] [] [] [] |
binutils | [] [] | bfd | [] [] |
bison | [] [] [] [] | binutils | [] [] |
clisp | [] [] [] [] | bison | [] [] [] [] |
cpio | [] [] [] [] | clisp | |
diffutils | [] [] [] [] [] [] | clisp | [] [] [] [] |
enscript | [] [] | clisplow | |
error | [] [] | cpio | [] [] [] [] |
fetchmail | [] () [] [] [] () | darkstat | () |
fileutils | [] [] [] [] [] | diffutils | [] [] [] [] [] [] |
findutils | [] [] [] [] [] | enscript | [] [] |
flex | [] [] [] [] [] | error | [] [] [] |
gas | [] [] | fetchmail | [] () [] [] [] () |
gawk | [] [] [] | fileutils | [] [] [] [] [] |
gcal | [] [] | findutils | [] [] [] [] [] [] |
gcc | [] [] | flex | [] [] [] [] [] |
gettext | [] [] [] [] [] | gas | [] [] |
gnupg | [] [] [] [] [] [] | gawk | [] [] [] |
gprof | [] [] | gcal | [] [] |
gpsdrive | () () () () () | gcc | [] [] |
grep | [] [] [] [] [] [] [] | gettext | [] [] [] [] [] |
gretl | | gnupg | [] [] [] [] [] [] [] |
hello | [] [] [] [] [] [] [] [] | gprof | [] [] |
id-utils | [] [] [] | gpsdrive | () () () () () |
indent | [] [] [] [] [] | grep | [] [] [] [] [] [] [] [] |
jpilot | () [] [] [] | gretl | [] |
jwhois | [] [] | gthumb | () () () |
kbd | [] [] | hello | [] [] [] [] [] [] [] [] [] |
ld | [] [] | id-utils | [] [] [] |
libc | [] [] [] [] [] [] [] | indent | [] [] [] [] [] |
lilypond | [] [] | jpilot | () [] [] [] |
lynx | [] [] [] [] | jwhois | [] [] |
m4 | [] [] [] [] [] | kbd | [] [] [] |
make | [] [] [] [] | ld | [] [] |
mysecretdiary | [] [] | libc | [] [] [] [] [] [] [] [] |
nano | [] () [] [] [] [] | libiconv | [] [] [] [] |
nano_1_0 | [] () [] [] [] [] | lifelines | () () |
opcodes | [] [] [] | lilypond | [] [] |
parted | [] [] [] [] [] | lingoteach | [] [] |
ptx | [] [] [] [] [] | lingoteach_lessons| () () |
python | | lynx | [] [] [] [] [] |
recode | [] [] [] [] [] [] | m4 | [] [] [] [] [] |
sed | [] [] [] [] [] [] [] [] | make | [] [] [] [] |
sh-utils | [] [] [] [] [] [] [] [] | man-db | [] () () [] () () |
sharutils | [] [] [] [] [] [] | mysecretdiary | [] [] [] |
sketch | () [] () | nano | [] () [] [] [] [] |
soundtracker | [] [] [] | nano_1_0 | [] () [] [] [] [] |
sp | [] | opcodes | [] [] [] |
tar | [] [] [] [] [] [] | parted | [] [] [] [] [] |
texinfo | [] [] [] [] [] | ptx | [] [] [] [] [] [] [] |
textutils | [] [] [] [] [] | python | |
util-linux | [] [] [] [] [] [] | recode | [] [] [] [] [] [] |
vorbis-tools | | sed | [] [] [] [] [] [] [] [] [] [] |
wastesedge | | sh-utils | [] [] [] [] |
wdiff | [] [] [] [] [] [] | sharutils | [] [] [] [] [] [] [] |
wget | [] [] [] [] [] [] [] [] [] | sketch | () [] () |
+-------------------------------------+ soundtracker | [] [] [] |
bg ca cs da de el en eo es et fi fr sp | [] |
2 14 11 31 40 10 1 8 41 16 1 50 tar | [] [] [] [] [] [] |
texinfo | [] [] [] [] [] |
textutils | [] [] [] [] [] |
util-linux | [] [] [] [] [] [] |
vorbis-tools | [] |
wastesedge | |
wdiff | [] [] [] [] [] [] |
wget | [] [] [] [] [] [] [] [] [] [] |
+----------------------------------------+
be bg ca cs da de el en eo es et fi fr
0 2 19 10 30 44 9 1 12 44 17 6 53
gl he hr hu id it ja ko lv nb nl nn gl he hr hu id it ja ko lv nb nl nn
+-------------------------------------+ +-------------------------------------+
a2ps | () () [] | a2ps | () () [] |
bash | | ap-utils | |
bash | [] |
bfd | [] | bfd | [] |
binutils | [] | binutils | [] |
bison | [] [] | bison | [] [] [] [] |
clisp | |
clisp | [] | clisp | [] |
cpio | [] [] [] | clisplow | |
diffutils | [] [] [] [] | cpio | [] [] [] [] |
darkstat | |
diffutils | [] [] [] [] [] |
enscript | [] [] | enscript | [] [] |
error | [] | error | [] |
fetchmail | [] | fetchmail | [] |
fileutils | [] [] [] | fileutils | [] [] [] |
findutils | [] [] [] [] [] [] [] | findutils | [] [] [] [] [] [] [] [] |
flex | [] | flex | [] |
gas | | gas | |
gawk | [] | gawk | [] |
gcal | | gcal | |
gcc | | gcc | [] |
gettext | [] [] | gettext | [] [] |
gnupg | [] [] [] [] | gnupg | [] [] [] [] |
gprof | | gprof | [] |
gpsdrive | () () | gpsdrive | [] () () |
grep | [] [] [] [] [] [] | grep | [] [] [] [] [] [] [] |
gretl | | gretl | |
gthumb | () () |
hello | [] [] [] [] [] [] [] [] [] [] [] [] | hello | [] [] [] [] [] [] [] [] [] [] [] [] |
id-utils | [] | id-utils | [] [] |
indent | [] [] [] | indent | [] [] [] [] |
jpilot | () () | jpilot | () () |
jwhois | [] | jwhois | [] [] |
kbd | | kbd | |
ld | | ld | |
libc | [] [] [] [] | libc | [] [] [] [] |
lilypond | [] [] | libiconv | [] [] [] |
lynx | [] [] [] | lifelines | |
lilypond | [] |
lingoteach | [] |
lingoteach_lessons| |
lynx | [] [] [] [] |
m4 | [] [] [] [] | m4 | [] [] [] [] |
make | [] [] [] [] [] [] | make | [] [] [] [] [] [] |
mysecretdiary | | man-db | () () |
nano | [] [] [] () [] [] [] | mysecretdiary | [] |
nano_1_0 | [] [] [] () [] [] | nano | [] [] [] [] |
opcodes | [] | nano_1_0 | [] [] [] [] [] |
opcodes | [] [] |
parted | [] [] [] | parted | [] [] [] |
ptx | [] [] [] [] | ptx | [] [] [] [] [] |
python | | python | |
recode | [] [] [] | recode | [] [] [] |
sed | [] [] [] [] [] [] [] | sed | [] [] [] [] [] [] [] [] |
sh-utils | [] [] [] [] [] | sh-utils | [] [] [] |
sharutils | [] [] [] | sharutils | [] [] [] |
sketch | () | sketch | () |
soundtracker | [] | soundtracker | [] [] |
sp | | sp | |
tar | [] [] [] [] [] | tar | [] [] [] [] [] [] |
texinfo | [] [] [] | texinfo | [] [] [] |
textutils | [] [] [] | textutils | [] [] [] [] |
util-linux | () [] | util-linux | () [] |
vorbis-tools | | vorbis-tools | [] |
wastesedge | | wastesedge | |
wdiff | [] [] | wdiff | [] [] [] |
wget | [] [] [] [] [] [] | wget | [] [] [] [] [] [] |
+-------------------------------------+ +-------------------------------------+
gl he hr hu id it ja ko lv nb nl nn gl he hr hu id it ja ko lv nb nl nn
23 9 8 4 12 12 25 9 1 8 20 4 23 9 12 19 16 13 26 9 1 7 19 3
no pl pt pt_BR ru sk sl sv tr uk zh_TW no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW
+----------------------------------------+ +----------------------------------------------+
a2ps | () () () [] [] [] [] () | 9 a2ps | () () () [] [] [] [] [] | 10
bash | | 4 ap-utils | () | 0
bfd | [] [] | 5 bash | [] | 6
binutils | [] | 4 bfd | [] [] | 5
bison | [] [] [] | 9 binutils | [] [] | 5
clisp | | 5 bison | [] [] [] [] | 12
cpio | [] [] [] [] | 11 clisp | | 0
diffutils | [] [] [] [] [] [] | 16 clisp | | 5
enscript | [] [] [] | 7 clisplow | | 0
error | [] [] [] | 6 cpio | [] [] [] [] | 12
fetchmail | () () [] | 6 darkstat | [] [] () () | 2
fileutils | [] [] [] [] [] | 13 diffutils | [] [] [] [] [] [] | 17
findutils | [] [] [] [] [] [] [] | 19 enscript | [] [] [] [] | 8
flex | [] [] [] | 9 error | [] [] [] | 7
gas | [] | 3 fetchmail | () () [] | 6
gawk | [] [] | 6 fileutils | [] [] [] [] [] [] | 14
gcal | [] [] | 4 findutils | [] [] [] [] [] [] [] | 21
gcc | [] | 3 flex | [] [] [] | 9
gettext | [] [] [] [] [] [] | 13 gas | [] | 3
gnupg | [] [] [] | 13 gawk | [] [] | 6
gprof | [] [] | 4 gcal | [] [] | 4
gpsdrive | () | 0 gcc | [] | 4
grep | [] [] [] [] | 17 gettext | [] [] [] [] [] [] | 13
gretl | | 0 gnupg | [] [] [] | 14
hello | [] [] [] [] [] [] [] | 27 gprof | [] [] | 5
id-utils | [] [] | 6 gpsdrive | [] [] | 3
indent | [] [] [] [] | 12 grep | [] [] [] [] [] | 20
jpilot | () () [] | 4 gretl | | 1
jwhois | () () [] [] | 5 gthumb | () () [] | 1
kbd | [] [] | 4 hello | [] [] [] [] [] [] [] | 28
ld | [] [] | 4 id-utils | [] [] [] [] | 9
libc | [] [] [] [] [] [] | 17 indent | [] [] [] [] [] | 14
lilypond | [] | 5 jpilot | () () [] [] | 5
lynx | [] [] [] | 10 jwhois | [] () () [] [] | 7
m4 | [] [] [] | 12 kbd | [] [] | 5
make | [] [] [] [] | 14 ld | [] [] | 4
mysecretdiary | [] [] | 4 libc | [] [] [] [] [] [] | 18
nano | () [] [] [] [] | 15 libiconv | [] [] [] [] [] | 12
nano_1_0 | () [] [] [] [] | 14 lifelines | [] | 1
opcodes | [] [] | 6 lilypond | [] | 4
parted | [] [] [] | 11 lingoteach | [] [] | 5
ptx | [] [] [] [] [] [] | 15 lingoteach_lessons| () | 0
python | | 0 lynx | [] [] [] [] | 13
recode | [] [] [] [] | 13 m4 | [] [] [] [] | 13
sed | [] [] [] [] [] [] | 21 make | [] [] [] [] [] | 15
sh-utils | [] [] [] [] [] [] [] [] [] | 22 man-db | | 3
sharutils | [] [] [] [] | 13 mysecretdiary | [] [] [] | 7
sketch | [] () | 3 nano | [] [] [] [] | 13
soundtracker | [] | 5 nano_1_0 | [] [] [] [] | 14
sp | | 1 opcodes | [] [] [] | 8
tar | [] [] [] [] [] [] [] | 18 parted | [] [] [] [] | 12
texinfo | [] [] | 10 ptx | [] [] [] [] [] [] [] | 19
textutils | [] [] [] [] [] | 13 python | | 0
util-linux | [] [] [] | 10 recode | [] [] [] [] [] [] | 15
vorbis-tools | [] | 1 sed | [] [] [] [] [] [] | 24
wastesedge | | 0 sh-utils | [] [] | 9
wdiff | [] [] [] [] | 12 sharutils | [] [] [] [] | 14
wget | [] [] [] [] [] [] [] [] | 23 sketch | [] () [] | 4
+----------------------------------------+ soundtracker | [] | 6
35 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW sp | | 1
58 domains 5 16 2 14 27 11 11 41 36 4 9 536 tar | [] [] [] [] [] [] [] | 19
texinfo | [] [] | 10
textutils | [] [] [] [] [] | 14
util-linux | [] [] [] | 10
vorbis-tools | [] | 3
wastesedge | | 0
wdiff | [] [] [] [] [] | 14
wget | [] [] [] [] [] [] [] [] | 24
+----------------------------------------------+
37 teams no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW
68 domains 4 15 2 28 28 12 10 49 43 4 1 9 609
Some counters in the preceding matrix are higher than the number of Some counters in the preceding matrix are higher than the number of
visible blocks let us expect. This is because a few extra PO files are visible blocks let us expect. This is because a few extra PO files are
@ -379,7 +409,7 @@ distributed as such by its maintainer. There might be an observable
lag between the mere existence a PO file and its wide availability in a lag between the mere existence a PO file and its wide availability in a
distribution. distribution.
If April 2002 seems to be old, you may fetch a more recent copy of If August 2002 seems to be old, you may fetch a more recent copy of
this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
matrix with full percentage details can be found at matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.

1
ChangeLog
View File

@ -1,6 +1,7 @@
CVS code - CVS code -
- General: - General:
- Translation updates (see po/ChangeLog for details). - Translation updates (see po/ChangeLog for details).
- Upgraded to gettext 0.11.5 (Jordi).
- Updated nano.1, nano.1.html, and nano.texi to fix an - Updated nano.1, nano.1.html, and nano.texi to fix an
inaccuracy in the description of -Q/--quotestr. (DLR) inaccuracy in the description of -Q/--quotestr. (DLR)
- Set REG_EXTENDED in all regcomp() calls. (DLR) - Set REG_EXTENDED in all regcomp() calls. (DLR)

2
Makefile.am
View File

@ -18,7 +18,7 @@ nano_SOURCES = color.c \
winio.c winio.c
man_MANS = nano.1 man_MANS = nano.1
nano_LDADD = @GLIB_LIBS@ @INTLLIBS@ nano_LDADD = @GLIB_LIBS@ @LIBINTL@
info_TEXINFOS = nano.texi info_TEXINFOS = nano.texi
MAKEINFO = makeinfo --no-split MAKEINFO = makeinfo --no-split

15
m4/ChangeLog
View File

@ -1,3 +1,18 @@
2002-08-21 gettextize <bug-gnu-gettext@gnu.org>
* gettext.m4: Upgrade to gettext-0.11.5.
* ulonglong.m4: New file, from gettext-0.11.5.
* iconv.m4: Upgrade to gettext-0.11.5.
* intdiv0.m4: New file, from gettext-0.11.5.
* inttypes.m4: New file, from gettext-0.11.5.
* inttypes_h.m4: New file, from gettext-0.11.5.
* inttypes-pri.m4: New file, from gettext-0.11.5.
* lcmessage.m4: Upgrade to gettext-0.11.5.
* lib-link.m4: Upgrade to gettext-0.11.5.
* stdint_h.m4: New file, from gettext-0.11.5.
* uintmax_t.m4: New file, from gettext-0.11.5.
* Makefile.am (EXTRA_DIST): Add the new files.
2002-06-03 gettextize <bug-gnu-gettext@gnu.org> 2002-06-03 gettextize <bug-gnu-gettext@gnu.org>
* codeset.m4: Upgrade to gettext-0.11.2. * codeset.m4: Upgrade to gettext-0.11.2.

6
m4/Makefile.am
View File

@ -1,2 +1,4 @@
EXTRA_DIST = isc-posix.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 codeset.m4 \ EXTRA_DIST = ulonglong.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 \
glibc21.m4 progtest.m4 gettext.m4 iconv.m4 lcmessage.m4 stdint_h.m4 uintmax_t.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 \
lib-prefix.m4 codeset.m4 glibc21.m4 progtest.m4 gettext.m4 \
iconv.m4 lcmessage.m4

68
m4/gettext.m4
View File

@ -1,4 +1,4 @@
# gettext.m4 serial 14 (gettext-0.11.2) # gettext.m4 serial 17 (gettext-0.11.5)
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, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General dnl General Public License. As a special exception to the GNU General
@ -33,7 +33,9 @@ dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
dnl $(top_builddir)/intl/libintl.a will be created. dnl $(top_builddir)/intl/libintl.a will be created.
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
dnl implementations (in libc or libintl) without the ngettext() function dnl implementations (in libc or libintl) without the ngettext() function
dnl will be ignored. dnl will be ignored. If NEEDSYMBOL is specified and is
dnl 'need-formatstring-macros', then GNU gettext implementations that don't
dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
dnl INTLDIR is used to find the intl libraries. If empty, dnl INTLDIR is used to find the intl libraries. If empty,
dnl the value `$(top_builddir)/intl/' is used. dnl the value `$(top_builddir)/intl/' is used.
dnl dnl
@ -60,9 +62,9 @@ AC_DEFUN([AM_GNU_GETTEXT],
ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
])])])])]) ])])])])])
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , 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], []))
@ -75,6 +77,21 @@ AC_DEFUN([AM_GNU_GETTEXT],
AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_REQUIRE([AC_LIB_RPATH]) AC_REQUIRE([AC_LIB_RPATH])
dnl Sometimes libintl requires libiconv, so first search for libiconv.
dnl Ideally we would do this search only after the
dnl if test "$USE_NLS" = "yes"; then
dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
dnl the configure script would need to contain the same shell code
dnl again, outside any 'if'. There are two solutions:
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
dnl documented, we avoid it.
ifelse(gt_included_intl, yes, , [
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
AC_MSG_CHECKING([whether NLS is requested]) AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS dnl Default is enabled NLS
AC_ARG_ENABLE(nls, AC_ARG_ENABLE(nls,
@ -110,13 +127,20 @@ AC_DEFUN([AM_GNU_GETTEXT],
dnl to fall back to GNU NLS library. dnl to fall back to GNU NLS library.
dnl Add a version number to the cache macros. dnl Add a version number to the cache macros.
define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1)) define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
[AC_TRY_LINK([#include <libintl.h> [AC_TRY_LINK([#include <libintl.h>
extern int _nl_msg_cat_cntr; ]ifelse([$2], [need-formatstring-macros],
[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
changequote(,)dnl
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
changequote([,])dnl
], [])[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 (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
@ -141,7 +165,14 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
LIBS="$LIBS $LIBINTL" LIBS="$LIBS $LIBINTL"
dnl Now see whether libintl exists and does not depend on libiconv. dnl Now see whether libintl exists and does not depend on libiconv.
AC_TRY_LINK([#include <libintl.h> AC_TRY_LINK([#include <libintl.h>
extern int _nl_msg_cat_cntr; ]ifelse([$2], [need-formatstring-macros],
[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
changequote(,)dnl
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
changequote([,])dnl
], [])[extern int _nl_msg_cat_cntr;
extern extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
@ -155,7 +186,14 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
LIBS="$LIBS $LIBICONV" LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <libintl.h> AC_TRY_LINK([#include <libintl.h>
extern int _nl_msg_cat_cntr; ]ifelse([$2], [need-formatstring-macros],
[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
changequote(,)dnl
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
changequote([,])dnl
], [])[extern int _nl_msg_cat_cntr;
extern extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
@ -450,7 +488,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
;; ;;
esac esac
done], done],
[# Capture the value of obsolete $ALL_LINGUAS because we need it to compute [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
# POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
# from automake. # from automake.
eval 'ALL_LINGUAS''="$ALL_LINGUAS"' eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
@ -479,6 +517,10 @@ AC_DEFUN([AM_INTL_SUBDIR],
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([jm_GLIBC21])dnl
AC_REQUIRE([gt_INTDIV0])dnl
AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
AC_REQUIRE([gt_INTTYPES_PRI])dnl
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
stdlib.h string.h unistd.h sys/param.h]) stdlib.h string.h unistd.h sys/param.h])
@ -488,7 +530,9 @@ strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
AM_ICONV AM_ICONV
AM_LANGINFO_CODESET AM_LANGINFO_CODESET
AM_LC_MESSAGES if test $ac_cv_header_locale_h = yes; then
AM_LC_MESSAGES
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,
dnl because plural.y uses bison specific features. It requires at least dnl because plural.y uses bison specific features. It requires at least
@ -537,3 +581,7 @@ AC_DEFUN([AM_MKINSTALLDIRS],
fi fi
AC_SUBST(MKINSTALLDIRS) AC_SUBST(MKINSTALLDIRS)
]) ])
dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])

19
m4/iconv.m4
View File

@ -1,4 +1,4 @@
# iconv.m4 serial AM3 (gettext-0.11) # 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, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General dnl General Public License. As a special exception to the GNU General
@ -8,11 +8,8 @@ dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible. dnl From Bruno Haible.
AC_DEFUN([AM_ICONV_LINK], AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
[ [
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_REQUIRE([AC_LIB_RPATH]) AC_REQUIRE([AC_LIB_RPATH])
@ -20,6 +17,16 @@ AC_DEFUN([AM_ICONV_LINK],
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
dnl accordingly. dnl accordingly.
AC_LIB_LINKFLAGS_BODY([iconv]) AC_LIB_LINKFLAGS_BODY([iconv])
])
AC_DEFUN([AM_ICONV_LINK],
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
dnl accordingly.
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl Add $INCICONV to CPPFLAGS before performing the following checks,
dnl because if the user has installed libiconv and not disabled its use dnl because if the user has installed libiconv and not disabled its use
@ -69,7 +76,7 @@ AC_DEFUN([AM_ICONV_LINK],
AC_DEFUN([AM_ICONV], AC_DEFUN([AM_ICONV],
[ [
AC_REQUIRE([AM_ICONV_LINK]) AM_ICONV_LINK
if test "$am_cv_func_iconv" = yes; then if test "$am_cv_func_iconv" = yes; then
AC_MSG_CHECKING([for iconv declaration]) AC_MSG_CHECKING([for iconv declaration])
AC_CACHE_VAL(am_cv_proto_iconv, [ AC_CACHE_VAL(am_cv_proto_iconv, [

72
m4/intdiv0.m4 Normal file
View File

@ -0,0 +1,72 @@
# intdiv0.m4 serial 1 (gettext-0.11.3)
dnl Copyright (C) 2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
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.
AC_DEFUN([gt_INTDIV0],
[
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
gt_cv_int_divbyzero_sigfpe,
[
AC_TRY_RUN([
#include <stdlib.h>
#include <signal.h>
static void
#ifdef __cplusplus
sigfpe_handler (int sig)
#else
sigfpe_handler (sig) int sig;
#endif
{
/* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
exit (sig != SIGFPE);
}
int x = 1;
int y = 0;
int z;
int nan;
int main ()
{
signal (SIGFPE, sigfpe_handler);
/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
signal (SIGTRAP, sigfpe_handler);
#endif
/* Linux/SPARC yields signal SIGILL. */
#if defined (__sparc__) && defined (__linux__)
signal (SIGILL, sigfpe_handler);
#endif
z = x / y;
nan = y / y;
exit (1);
}
], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
[
# Guess based on the CPU.
case "$host_cpu" in
alpha* | i[34567]86 | m68k | s390*)
gt_cv_int_divbyzero_sigfpe="guessing yes";;
*)
gt_cv_int_divbyzero_sigfpe="guessing no";;
esac
])
])
case "$gt_cv_int_divbyzero_sigfpe" in
*yes) value=1;;
*) value=0;;
esac
AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
[Define if integer division by zero raises signal SIGFPE.])
])

32
m4/inttypes-pri.m4 Normal file
View File

@ -0,0 +1,32 @@
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
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.
# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
# macros to non-string values. This is the case on AIX 4.3.3.
AC_DEFUN([gt_INTTYPES_PRI],
[
AC_REQUIRE([gt_HEADER_INTTYPES_H])
if test $gt_cv_header_inttypes_h = yes; then
AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
gt_cv_inttypes_pri_broken,
[
AC_TRY_COMPILE([#include <inttypes.h>
#ifdef PRId32
char *p = PRId32;
#endif
], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
])
fi
if test "$gt_cv_inttypes_pri_broken" = yes; then
AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
[Define if <inttypes.h> exists and defines unusable PRI* macros.])
fi
])

27
m4/inttypes.m4 Normal file
View File

@ -0,0 +1,27 @@
# inttypes.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
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.
# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
# <sys/types.h>.
AC_DEFUN([gt_HEADER_INTTYPES_H],
[
AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
[
AC_TRY_COMPILE(
[#include <sys/types.h>
#include <inttypes.h>],
[], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
])
if test $gt_cv_header_inttypes_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
[Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
fi
])

28
m4/inttypes_h.m4 Normal file
View File

@ -0,0 +1,28 @@
# inttypes_h.m4 serial 4 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
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.
# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
# doesn't clash with <sys/types.h>, and declares uintmax_t.
AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
[
AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
[AC_TRY_COMPILE(
[#include <sys/types.h>
#include <inttypes.h>],
[uintmax_t i = (uintmax_t) -1;],
jm_ac_cv_header_inttypes_h=yes,
jm_ac_cv_header_inttypes_h=no)])
if test $jm_ac_cv_header_inttypes_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
and declares uintmax_t. ])
fi
])

18
m4/lcmessage.m4
View File

@ -1,4 +1,4 @@
# lcmessage.m4 serial 2 (gettext-0.10.40) # lcmessage.m4 serial 3 (gettext-0.11.3)
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, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General dnl General Public License. As a special exception to the GNU General
@ -21,12 +21,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([AM_LC_MESSAGES],
[if test $ac_cv_header_locale_h = yes; then [
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, AC_CACHE_CHECK([for LC_MESSAGES], am_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)]) am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
if test $am_cv_val_LC_MESSAGES = yes; then if test $am_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
fi]) ])

52
m4/lib-link.m4
View File

@ -1,4 +1,4 @@
# lib-link.m4 serial 2 (gettext-0.11.2) # lib-link.m4 serial 3 (gettext-0.11.3)
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, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General dnl General Public License. As a special exception to the GNU General
@ -116,6 +116,10 @@ AC_DEFUN([AC_LIB_RPATH],
hardcode_minus_L="$acl_cv_hardcode_minus_L" hardcode_minus_L="$acl_cv_hardcode_minus_L"
sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
dnl Determine whether the user wants rpath handling at all.
AC_ARG_ENABLE(rpath,
[ --disable-rpath do not hardcode runtime library paths],
:, enable_rpath=yes)
]) ])
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@ -245,7 +249,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
dnl Linking with a shared library. We attempt to hardcode its dnl Linking with a shared library. We attempt to hardcode its
dnl directory into the executable's runpath, unless it's the dnl directory into the executable's runpath, unless it's the
dnl standard /usr/lib. dnl standard /usr/lib.
if test "X$found_dir" = "X/usr/lib"; then if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
dnl No hardcoding is needed. dnl No hardcoding is needed.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else else
@ -436,29 +440,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
;; ;;
-R*) -R*)
dir=`echo "X$dep" | sed -e 's/^X-R//'` dir=`echo "X$dep" | sed -e 's/^X-R//'`
dnl Potentially add DIR to rpathdirs. if test "$enable_rpath" != no; then
dnl The rpathdirs will be appended to $LIBNAME at the end. dnl Potentially add DIR to rpathdirs.
haveit= dnl The rpathdirs will be appended to $LIBNAME at the end.
for x in $rpathdirs; do haveit=
if test "X$x" = "X$dir"; then for x in $rpathdirs; do
haveit=yes if test "X$x" = "X$dir"; then
break haveit=yes
break
fi
done
if test -z "$haveit"; then
rpathdirs="$rpathdirs $dir"
fi fi
done dnl Potentially add DIR to ltrpathdirs.
if test -z "$haveit"; then dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
rpathdirs="$rpathdirs $dir" haveit=
fi for x in $ltrpathdirs; do
dnl Potentially add DIR to ltrpathdirs. if test "X$x" = "X$dir"; then
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. haveit=yes
haveit= break
for x in $ltrpathdirs; do fi
if test "X$x" = "X$dir"; then done
haveit=yes if test -z "$haveit"; then
break ltrpathdirs="$ltrpathdirs $dir"
fi fi
done
if test -z "$haveit"; then
ltrpathdirs="$ltrpathdirs $dir"
fi fi
;; ;;
-l*) -l*)

28
m4/stdint_h.m4 Normal file
View File

@ -0,0 +1,28 @@
# stdint_h.m4 serial 2 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
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.
# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
# doesn't clash with <sys/types.h>, and declares uintmax_t.
AC_DEFUN([jm_AC_HEADER_STDINT_H],
[
AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
[AC_TRY_COMPILE(
[#include <sys/types.h>
#include <stdint.h>],
[uintmax_t i = (uintmax_t) -1;],
jm_ac_cv_header_stdint_h=yes,
jm_ac_cv_header_stdint_h=no)])
if test $jm_ac_cv_header_stdint_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
and declares uintmax_t. ])
fi
])

29
m4/uintmax_t.m4 Normal file
View File

@ -0,0 +1,29 @@
# uintmax_t.m4 serial 6 (gettext-0.11)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
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.
AC_PREREQ(2.13)
# Define uintmax_t to `unsigned long' or `unsigned long long'
# if <inttypes.h> does not exist.
AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
[
AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
AC_REQUIRE([jm_AC_HEADER_STDINT_H])
if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
test $ac_cv_type_unsigned_long_long = yes \
&& ac_type='unsigned long long' \
|| ac_type='unsigned long'
AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
[Define to unsigned long or unsigned long long
if <inttypes.h> and <stdint.h> don't define.])
fi
])

23
m4/ulonglong.m4 Normal file
View File

@ -0,0 +1,23 @@
# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
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.
AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
[
AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
[AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
[unsigned long long ullmax = (unsigned long long) -1;
return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
ac_cv_type_unsigned_long_long=yes,
ac_cv_type_unsigned_long_long=no)])
if test $ac_cv_type_unsigned_long_long = yes; then
AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
[Define if you have the unsigned long long type.])
fi
])