diff options
| -rw-r--r-- | gettext-runtime/intl-java/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/intl-java/Makefile.am | 6 | ||||
| -rw-r--r-- | gettext-runtime/libasprintf/ChangeLog | 8 | ||||
| -rw-r--r-- | gettext-runtime/libasprintf/Makefile.am | 6 | ||||
| -rw-r--r-- | gettext-runtime/libasprintf/configure.ac | 33 |
5 files changed, 50 insertions, 8 deletions
diff --git a/gettext-runtime/intl-java/ChangeLog b/gettext-runtime/intl-java/ChangeLog index 5f1795e..4243fb3 100644 --- a/gettext-runtime/intl-java/ChangeLog +++ b/gettext-runtime/intl-java/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bruno Haible <bruno@clisp.org> + + * Makefile.am (docdir): Use 'gettext' instead of @PACKAGE@. + (EXTRA_DIST): Fix typo. + 2003-01-12 Bruno Haible <bruno@clisp.org> * Makefile.am: Make use of += for variables. diff --git a/gettext-runtime/intl-java/Makefile.am b/gettext-runtime/intl-java/Makefile.am index b70052a..7e0ba32 100644 --- a/gettext-runtime/intl-java/Makefile.am +++ b/gettext-runtime/intl-java/Makefile.am @@ -1,4 +1,4 @@ -## Makefile for intl-java directory in GNU NLS utilities package. +## Makefile for the gettext-runtime/intl-java subdirectory of GNU gettext ## Copyright (C) 2001-2003 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify @@ -24,7 +24,7 @@ CLEANFILES = RM = rm -f jardir = $(datadir)/gettext -docdir = $(prefix)/doc/@PACKAGE@ +docdir = $(prefix)/doc/gettext htmldir = $(docdir) JAR = @JAR@ @@ -141,7 +141,7 @@ JAVADOC2_FILES = \ javadoc2/gnu/gettext/package-frame.html \ javadoc2/gnu/gettext/GettextResource.html -EXTRA_DIST += $(JAVADOC1_FILES) +EXTRA_DIST += $(JAVADOC2_FILES) install-javadoc2: all-javadoc2 $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2 diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index ce9e4f7..54083c2 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,11 @@ +2003-02-12 Bruno Haible <bruno@clisp.org> + + * configure.ac: Renamed from configure.in. Invoke AC_CONFIG_AUX_DIR. + Invoke AC_FUNC_ALLOCA instead of gl_FUNC_ALLOCA. Remove redundant + postprocessing of Makefile. + * Makefile.am (ACLOCAL_AMFLAGS): Add -I ../../config/m4. + ($(libasprintf_la_OBJECTS)): Make alloca.h dependency effective. + 2003-01-03 Albert Chin <libtool@thewrittenword.com> * ltmain.sh: Don't pass -R flags found in a .la's dependency_libs diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am index 4be6560..ae4be88 100644 --- a/gettext-runtime/libasprintf/Makefile.am +++ b/gettext-runtime/libasprintf/Makefile.am @@ -1,4 +1,4 @@ -## Makefile for the libasprintf subdirectory of the GNU NLS Utilities +## Makefile for the gettext-runtime/libasprintf subdirectory of GNU gettext ## Copyright (C) 2002-2003 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies -ACLOCAL_AMFLAGS = -I ../m4 +ACLOCAL_AMFLAGS = -I ../../config/m4 -I ../m4 EXTRA_DIST = MOSTLYCLEANFILES = @@ -52,7 +52,7 @@ EXTRA_DIST += alloca_.h # The following is needed in order to create an <alloca.h> when the system # doesn't have one that works with the given compiler. -all-local $(lib_OBJECTS): @ALLOCA_H@ +all-local $(libasprintf_la_OBJECTS): @ALLOCA_H@ alloca.h: alloca_.h cp $(srcdir)/alloca_.h alloca.h MOSTLYCLEANFILES += alloca.h diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac index 1092744..b3f4276 100644 --- a/gettext-runtime/libasprintf/configure.ac +++ b/gettext-runtime/libasprintf/configure.ac @@ -1,7 +1,26 @@ +dnl Configuration for the GNU libasprintf library +dnl Copyright (C) 2002-2003 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 +dnl the Free Software Foundation; either version 2, or (at your option) +dnl any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + dnl Process this file with autoconf to produce a configure script. + AC_PREREQ(2.52) AC_INIT AC_CONFIG_SRCDIR(vasprintf.c) +AC_CONFIG_AUX_DIR(../../config) AM_INIT_AUTOMAKE(libasprintf, 1.0) AM_CONFIG_HEADER(config.h) @@ -37,7 +56,18 @@ AC_CHECK_TYPES(ptrdiff_t) gt_TYPE_INTMAX_T dnl Checks for library functions. -gl_FUNC_ALLOCA + +AC_FUNC_ALLOCA +dnl Define an additional variable used in the Makefile substitution. +AC_EGREP_CPP([Need own alloca], [ +#if defined __GNUC__ || defined _MSC_VER || !HAVE_ALLOCA_H + Need own alloca +#endif + ], + ALLOCA_H=alloca.h, + ALLOCA_H=) +AC_SUBST([ALLOCA_H]) + AC_CHECK_FUNCS([snprintf vasprintf]) dnl Check for tools needed for formatting the documentation. @@ -48,7 +78,6 @@ AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl) AC_CONFIG_FILES([Makefile], [FIX_MAKEFILE_COMPILE([Makefile]) - FIX_MAKEFILE_DISTRIB([Makefile]) FIX_MAKEFILE_INFO([Makefile])]) AC_OUTPUT |