diff options
| author | Jim Meyering <jim@meyering.net> | 1996-07-06 03:00:35 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1996-07-06 03:00:35 +0000 |
| commit | c9e1263f7d0cd524d1abe7279f2794dab798da18 (patch) | |
| tree | 74b614ee9f1065ec8b6e37e5fbcf65ad3f433b1a /intl | |
| parent | a7c1ba5ccfe9d58ea938d5f9f49592eae4da4da6 (diff) | |
| download | idutils-c9e1263f7d0cd524d1abe7279f2794dab798da18.tar.gz idutils-c9e1263f7d0cd524d1abe7279f2794dab798da18.tar.bz2 idutils-c9e1263f7d0cd524d1abe7279f2794dab798da18.zip | |
merge with gettext-0.10.23
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/ChangeLog | 13 | ||||
| -rw-r--r-- | intl/Makefile.in | 9 | ||||
| -rw-r--r-- | intl/VERSION | 2 | ||||
| -rw-r--r-- | intl/l10nflist.c | 21 |
4 files changed, 36 insertions, 9 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index 78b173f..32ef3c3 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,16 @@ +Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com> + + * Makefile.in (MKINSTALLDIRS): New variable. Path to + mkinstalldirs script. + (install): use MKINSTALLDIRS variable or if the script is not present + try to find it in the $top_scrdir). + +Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com> + + * l10nflist.c: Linux libc *partly* includes the argz_* functions. + Grr. Work around by renaming the static version and use macros + for renaming. + Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com> * l10nflist.c: Correct presence test macros of __argz_* functions. diff --git a/intl/Makefile.in b/intl/Makefile.in index 761ae62..85ed9c5 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -38,6 +38,7 @@ subdir = intl INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = @MKINSTALLDIRS@ AR = ar CC = @CC@ @@ -98,8 +99,12 @@ check: all # package, you have to use `configure --with-included-gettext'. install: all if test "$(PACKAGE)" = "gettext"; then \ - $(top_srcdir)/mkinstalldirs $(libdir) $(includedir) \ - $(gettextsrcdir); \ + if test -r $(MKINSTALLDIRS); then \ + $(MKINSTALLDIRS) $(libdir) $(includedir) $(gettextsrcdir); \ + else \ + $(top_srcdir)/mkinstalldirs $(libdir) $(includedir) \ + $(gettextsrcdir); \ + fi; \ if test '@INTLOBJS@' = '$(GETTOBJS)'; then \ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ diff --git a/intl/VERSION b/intl/VERSION index 8bc88ad..894bda1 100644 --- a/intl/VERSION +++ b/intl/VERSION @@ -1 +1 @@ -GNU gettext library from gettext-0.10.20 +GNU gettext library from gettext-0.10.23 diff --git a/intl/l10nflist.c b/intl/l10nflist.c index 8fa91e4..18c5ba5 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -72,10 +72,10 @@ static char *stpcpy PARAMS ((char *dest, const char *src)); #if !defined _LIBC && !defined HAVE___ARGZ_COUNT /* Returns the number of strings in ARGZ. */ -static size_t __argz_count PARAMS ((const char *argz, size_t len)); +static size_t argz_count__ PARAMS ((const char *argz, size_t len)); static size_t -__argz_count (argz, len) +argz_count__ (argz, len) const char *argz; size_t len; { @@ -89,15 +89,17 @@ __argz_count (argz, len) } return count; } +# undef __argz_count +# define __argz_count(argz, len) argz_count__ (argz, len) #endif /* !_LIBC && !HAVE___ARGZ_COUNT */ #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's except the last into the character SEP. */ -static void __argz_stringify PARAMS ((char *argz, size_t len, int sep)); +static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); static void -__argz_stringify (argz, len, sep) +argz_stringify__ (argz, len, sep) char *argz; size_t len; int sep; @@ -111,11 +113,16 @@ __argz_stringify (argz, len, sep) *argz++ = sep; } } -#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ +# undef __argz_stringify +# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) +#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ #if !defined _LIBC && !defined HAVE___ARGZ_NEXT +static char *argz_next__ PARAMS ((char *argz, size_t argz_len, + const char *entry)); + static char * -__argz_next (argz, argz_len, entry) +argz_next__ (argz, argz_len, entry) char *argz; size_t argz_len; const char *entry; @@ -133,6 +140,8 @@ __argz_next (argz, argz_len, entry) else return 0; } +# undef __argz_next +# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) #endif /* !_LIBC && !HAVE___ARGZ_NEXT */ |