diff options
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/ChangeLog | 6 | ||||
| -rw-r--r-- | gettext-runtime/Makefile.am | 2 | ||||
| -rw-r--r-- | gettext-runtime/configure.ac | 3 | ||||
| -rw-r--r-- | gettext-runtime/lib/ChangeLog | 9 | ||||
| -rw-r--r-- | gettext-runtime/lib/Makefile.am | 18 |
5 files changed, 35 insertions, 3 deletions
diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index a3dd08f..8e9dd40 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,5 +1,11 @@ 2005-01-06 Bruno Haible <bruno@clisp.org> + * configure.ac: Invoke gl_GETOPT. + * Makefile.am (config.h_vms, config.h.msvc): Define __GETOPT_PREFIX + to empty. + +2005-01-06 Bruno Haible <bruno@clisp.org> + * Makefile.am (config.h_vms, config.h.msvc): Define USE_UNLOCKED_IO to 1. diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index f0db51e..3f4d93f 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -101,6 +101,7 @@ config.h_vms: config.h.in ../version.sh -e 's/#undef MALLOC_0_IS_NONNULL$$/#define MALLOC_0_IS_NONNULL 0/' \ -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \ -e 's/#undef USE_UNLOCKED_IO$$/#define USE_UNLOCKED_IO 1/' \ + -e 's/#undef __GETOPT_PREFIX$$/#define __GETOPT_PREFIX/' \ -e 's/#undef realpath$$/#define realpath rpl_realpath/' \ -e 's/#undef uintmax_t$$/#define uintmax_t unsigned long long/' \ -e 's/#undef PACKAGE$$/#define PACKAGE "gettext-runtime"/' \ @@ -161,6 +162,7 @@ config.h.msvc: config.h.in ../version.sh -e 's/#undef STACK_DIRECTION$$/#define STACK_DIRECTION -1/' \ -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \ -e 's/#undef USE_UNLOCKED_IO$$/#define USE_UNLOCKED_IO 1/' \ + -e 's/#undef __GETOPT_PREFIX$$/#define __GETOPT_PREFIX/' \ -e 's/#undef inline$$/#define inline __inline/' \ -e 's/#undef ssize_t$$/#define ssize_t int/' \ -e 's/#undef uintmax_t$$/#define uintmax_t unsigned long/' \ diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 5120d69..b3ca806 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the gettext-runtime directory of GNU gettext -dnl Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc. +dnl Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc. dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -86,6 +86,7 @@ gl_ALLOCSA AC_FUNC_VPRINTF AC_CHECK_FUNCS([setlocale strerror strtoul]) AC_REPLACE_FUNCS([atexit memmove]) +gl_GETOPT gt_FUNC_SETENV gl_FUNC_STRERROR gl_FUNC_GLIBC_UNLOCKED_IO diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog index 20a85ec..c6f22f3 100644 --- a/gettext-runtime/lib/ChangeLog +++ b/gettext-runtime/lib/ChangeLog @@ -1,3 +1,12 @@ +2005-01-06 Bruno Haible <bruno@clisp.org> + + * Makefile.am (libgrt_a_SOURCES): Remove getopt files. + (LIBADD_SOURCE): Add getopt files here, except getopt.h. + (BUILT_SOURCES): New variable. + (EXTRA_DIST, all-local, getopt.h): Support for getopt module. + * getopt.c: New file. + * getopt1.c: New file. + 2004-01-29 Bruno Haible <bruno@clisp.org> * gettext-0.14.1 released. diff --git a/gettext-runtime/lib/Makefile.am b/gettext-runtime/lib/Makefile.am index 51a830d..87e4de8 100644 --- a/gettext-runtime/lib/Makefile.am +++ b/gettext-runtime/lib/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/lib subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2004 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 under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies EXTRA_DIST = +BUILT_SOURCES = MOSTLYCLEANFILES = noinst_LIBRARIES = libgrt.a @@ -31,7 +32,6 @@ libgrt_a_SOURCES = \ ../../gettext-tools/lib/error.h ../../gettext-tools/lib/error.c \ ../../gettext-tools/lib/exit.h \ ../../gettext-tools/lib/fwriteerror.h ../../gettext-tools/lib/fwriteerror.c \ - ../../gettext-tools/lib/getopt.h ../../gettext-tools/lib/getopt.c ../../gettext-tools/lib/getopt1.c \ ../../gettext-tools/lib/pathmax.h \ ../../gettext-tools/lib/progname.h ../../gettext-tools/lib/progname.c ../../gettext-tools/lib/progreloc.c \ ../../gettext-tools/lib/strtoul.c \ @@ -44,6 +44,7 @@ libgrt_a_SOURCES = \ LIBADD_SOURCE = \ atexit.c \ ../../gettext-tools/lib/canonicalize.h canonicalize.c \ + getopt.c getopt1.c ../../gettext-tools/lib/getopt_int.h \ memmove.c \ readlink.c \ ../../gettext-tools/lib/relocatable.h relocatable.c \ @@ -91,6 +92,19 @@ MOSTLYCLEANFILES += alloca.h # <<< gnulib module alloca. +# >>> gnulib module getopt. +BUILT_SOURCES += $(GETOPT_H) +EXTRA_DIST += ../../gettext-tools/lib/getopt_.h ../../gettext-tools/lib/getopt_int.h + +# The following is needed in order to create a <getopt.h> when the system +# doesn't have one that works. +all-local $(libgettextlib_la_OBJECTS): @GETOPT_H@ +getopt.h: ../../gettext-tools/lib/getopt_.h + cp $(srcdir)/../../gettext-tools/lib/getopt_.h getopt.h +MOSTLYCLEANFILES += getopt.h +# <<< gnulib module getopt. + + # VMS support. EXTRA_DIST += Makefile.vms |