mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-26 07:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move intmax_t.m4 file into libasprintf subdirectory.

Browse Source
This commit is contained in:
Bruno Haible 2012-02-19 02:09:34 +01:00
parent e9ab552659
commit 89d66f0372
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2012-02-18 Bruno Haible <bruno@clisp.org>
Improve ensurance that intmax_t gets defined in libasprintf.
* autogen.sh: Create gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4,
not gettext-runtime/m4/intmax_t.m4.
* Makefile.am (distcheck-hook): Update.
2012-02-18 Bruno Haible <bruno@clisp.org>
* Makefile.am (distcheck-hook): Update after gnulib changed.

4
Makefile.am
View File

@ -1,5 +1,5 @@
## Makefile for the toplevel directory of GNU gettext
## Copyright (C) 1995-1999, 2000-2011 Free Software Foundation, Inc.
## Copyright (C) 1995-1999, 2000-2012 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
@ -53,7 +53,6 @@ distcheck-hook:
cmp -s gettext-runtime/m4/intldir.m4 gettext-tools/gnulib-m4/intldir.m4
cmp -s gettext-runtime/m4/intlmacosx.m4 gettext-tools/gnulib-m4/intlmacosx.m4
cmp -s gettext-runtime/m4/intmax.m4 gettext-tools/gnulib-m4/intmax.m4
cmp -s gettext-runtime/m4/intmax_t.m4 gettext-tools/gnulib-m4/intmax_t.m4
cmp -s gettext-runtime/m4/inttypes-pri.m4 gettext-tools/gnulib-m4/inttypes-pri.m4
cmp -s gettext-runtime/m4/inttypes_h.m4 gettext-tools/gnulib-m4/inttypes_h.m4
cmp -s gettext-runtime/m4/lcmessage.m4 gettext-tools/gnulib-m4/lcmessage.m4
@ -72,6 +71,7 @@ distcheck-hook:
cmp -s gettext-runtime/m4/wchar_t.m4 gettext-tools/gnulib-m4/wchar_t.m4
cmp -s gettext-runtime/m4/wint_t.m4 gettext-tools/gnulib-m4/wint_t.m4
cmp -s gettext-runtime/m4/xsize.m4 gettext-tools/gnulib-m4/xsize.m4
cmp -s gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 gettext-tools/gnulib-m4/intmax_t.m4
test "`sed 1,17d gettext-runtime/intl/config.charset | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/config.charset | md5sum`"
test "`sed 1,16d gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.h | md5sum`"
test "`sed 1,16d gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.c | md5sum`"

4
autogen.sh
View File

@ -16,7 +16,7 @@
# - the makeinfo program from the texinfo package,
# - perl.
# Copyright (C) 2003-2011 Free Software Foundation, Inc.
# Copyright (C) 2003-2012 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
@ -113,7 +113,7 @@ if ! $skip_gnulib; then
'
$GNULIB_TOOL --dir=gettext-runtime/libasprintf --source-base=. --m4-base=gnulib-m4 --lgpl=2 --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
--import $GNULIB_MODULES_LIBASPRINTF $GNULIB_MODULES_LIBASPRINTF_OTHER
$GNULIB_TOOL --copy-file m4/intmax_t.m4 gettext-runtime/m4/intmax_t.m4
$GNULIB_TOOL --copy-file m4/intmax_t.m4 gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4
# In gettext-tools:
GNULIB_MODULES_TOOLS_FOR_SRC='
alloca-opt

4
gettext-runtime/m4/ChangeLog
View File

@ -1,3 +1,7 @@
2012-02-18 Bruno Haible <bruno@clisp.org>
* Makefile.am (EXTRA_DIST): Remove intmax_t.m4.
2012-02-05 Paul Eggert <eggert@cs.ucla.edu>
* po.m4: Spelling fixes.

1
gettext-runtime/m4/Makefile.am
View File

@ -14,7 +14,6 @@ intl.m4 \
intldir.m4 \
intlmacosx.m4 \
intmax.m4 \
intmax_t.m4 \
inttypes-pri.m4 \
inttypes_h.m4 \
lcmessage.m4 \