[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog configure.ac build-aux/compil...
|
From: |
karl |
|
Subject: |
texinfo ChangeLog configure.ac build-aux/compil... |
|
Date: |
Fri, 09 Nov 2012 16:36:14 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: karl <karl> 12/11/09 16:36:13
Modified files:
. : ChangeLog configure.ac
build-aux : compile config.guess config.sub depcomp
doc : info.texi version.texi
gnulib/lib : Makefile.am errno.in.h fcntl.in.h malloca.h
mbchar.c mbchar.h mbiter.h mbuiter.h
stdlib.in.h strerror-override.c
strerror-override.h xalloc-oversized.h
gnulib/m4 : eealloc.m4 errno_h.m4 gnulib-comp.m4 lib-ld.m4
mbchar.m4 mbiter.m4 stdlib_h.m4 xsize.m4
texi2html : Makefile.am
tp : Makefile.am
Added files:
gnulib/lib : mbiter.c mbuiter.c
gnulib/m4 : extern-inline.m4
Log message:
gnulib, srclist, autotools
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1432&r2=1.1433
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/texinfo/build-aux/compile?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/build-aux/config.guess?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/build-aux/config.sub?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/build-aux/depcomp?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/info.texi?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/version.texi?cvsroot=texinfo&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/Makefile.am?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/errno.in.h?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/fcntl.in.h?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/malloca.h?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/mbchar.c?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/mbchar.h?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/mbiter.h?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/mbuiter.h?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/stdlib.in.h?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/strerror-override.c?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/strerror-override.h?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/xalloc-oversized.h?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/mbiter.c?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/mbuiter.c?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/eealloc.m4?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/errno_h.m4?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/gnulib-comp.m4?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/lib-ld.m4?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/mbchar.m4?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/mbiter.m4?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/stdlib_h.m4?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/xsize.m4?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/extern-inline.m4?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.am?cvsroot=texinfo&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.45&r2=1.46
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1432
retrieving revision 1.1433
diff -u -b -r1.1432 -r1.1433
--- ChangeLog 8 Nov 2012 23:08:43 -0000 1.1432
+++ ChangeLog 9 Nov 2012 16:36:10 -0000 1.1433
@@ -1,3 +1,11 @@
+2012-11-09 Karl Berry <address@hidden>
+
+ * configure.ac: remove MKDIR_P fallback.
+ * texi2html/Makefile.am,
+ * tp/Makefile.am: consistently use $(mkdir_p) rather than $(MKDIR_P).
+
+ * Run gnulib-tool --import, srclist.txi.
+
2012-11-08 Karl Berry <address@hidden>
* doc/texinfo.txi (@indentedblock): new node for new command.
Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- configure.ac 12 Sep 2012 01:12:25 -0000 1.117
+++ configure.ac 9 Nov 2012 16:36:11 -0000 1.118
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.117 2012/09/12 01:12:25 karl Exp $
+# $Id: configure.ac,v 1.118 2012/11/09 16:36:11 karl Exp $
#
# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
# Free Software Foundation, Inc.
@@ -53,13 +53,7 @@
AC_PROG_MAKE_SET
AC_PROG_LN_S
-AM_PROG_MKDIR_P
-
-# Happens with some automake version
-if test z"$MKDIR_P" = 'z'; then
- MKDIR_P=$mkdir_p
- AC_SUBST([MKDIR_P])
-fi
+AC_PROG_MKDIR_P
dnl gettext Makefiles may need MKINSTALLDIRS
MKINSTALLDIRS="\$(top_srcdir)/build-aux/install-sh -d"
Index: build-aux/compile
===================================================================
RCS file: /sources/texinfo/texinfo/build-aux/compile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- build-aux/compile 6 Jul 2012 23:19:44 -0000 1.3
+++ build-aux/compile 9 Nov 2012 16:36:11 -0000 1.4
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2012 Free Software Foundation, Inc.
# Written by Tom Tromey <address@hidden>.
@@ -112,6 +112,11 @@
lib=$dir/$lib.lib
break
fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
done
IFS=$save_IFS
Index: build-aux/config.guess
===================================================================
RCS file: /sources/texinfo/texinfo/build-aux/config.guess,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- build-aux/config.guess 21 Sep 2012 17:59:54 -0000 1.7
+++ build-aux/config.guess 9 Nov 2012 16:36:11 -0000 1.8
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-08-14'
+timestamp='2012-09-25'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -306,7 +306,7 @@
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
Index: build-aux/config.sub
===================================================================
RCS file: /sources/texinfo/texinfo/build-aux/config.sub,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- build-aux/config.sub 21 Sep 2012 17:59:54 -0000 1.6
+++ build-aux/config.sub 9 Nov 2012 16:36:11 -0000 1.7
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-08-18'
+timestamp='2012-10-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -156,7 +156,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@@ -273,7 +273,7 @@
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -389,7 +389,8 @@
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -788,7 +789,7 @@
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
mingw64)
Index: build-aux/depcomp
===================================================================
RCS file: /sources/texinfo/texinfo/build-aux/depcomp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- build-aux/depcomp 21 Sep 2012 17:59:54 -0000 1.6
+++ build-aux/depcomp 9 Nov 2012 16:36:11 -0000 1.7
@@ -74,6 +74,9 @@
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -108,7 +111,7 @@
fi
if test "$depmode" = xlc; then
- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
gccflag=-qmakedep=gcc,-MF
depmode=gcc
fi
@@ -142,13 +145,17 @@
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
Index: doc/info.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/info.texi,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- doc/info.texi 17 Oct 2011 00:06:51 -0000 1.29
+++ doc/info.texi 9 Nov 2012 16:36:11 -0000 1.30
@@ -14,9 +14,7 @@
This file describes how to use Info, the on-line, menu-driven GNU
documentation system.
-Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -1109,7 +1107,7 @@
this is so you need not count how many entries are there.
If your display supports multiple fonts, colors or underlining, and
-you are using Emacs' Info mode to read Info files, the third, sixth
+you are using Emacs's Info mode to read Info files, the third, sixth
and ninth menu items have a @samp{*} that stands out, either in color
or in some other attribute, such as underline; this makes it easy to
see at a glance which number to use for an item.
@@ -1143,6 +1141,12 @@
switches to the Info buffer with that number. Thus, @kbd{C-u 2 C-h i}
switches to the buffer @samp{*info*<2>}, creating it if necessary.
address@hidden info-display-manual
+ If you have created many Info buffers in Emacs, you might find it
+difficult to remember which buffer is showing which manual. You can
+use the command @kbd{M-x info-display-manual} to show an Info manual
+by name, reusing an existing buffer if there is one.
+
@node Emacs Info Variables, , Create Info buffer, Advanced
@comment node-name, next, previous, up
@section Emacs Info-mode Variables
@@ -1231,6 +1235,7 @@
@node Expert Info
@chapter Info for Experts
address@hidden Texinfo
This chapter explains how to write an Info file by hand. However,
in most cases, writing a Texinfo file is better, since you can use it
@@ -1508,7 +1513,3 @@
@printindex cp
@bye
-
address@hidden
- arch-tag: 965c1638-01d6-4156-9227-b10418b9d8e8
address@hidden ignore
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- doc/version.texi 21 Sep 2012 17:59:54 -0000 1.122
+++ doc/version.texi 9 Nov 2012 16:36:11 -0000 1.123
@@ -1,4 +1,4 @@
address@hidden UPDATED 21 September 2012
address@hidden UPDATED-MONTH September 2012
address@hidden UPDATED 8 November 2012
address@hidden UPDATED-MONTH November 2012
@set EDITION 4.13.90
@set VERSION 4.13.90
Index: gnulib/lib/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- gnulib/lib/Makefile.am 15 May 2012 17:19:32 -0000 1.49
+++ gnulib/lib/Makefile.am 9 Nov 2012 16:36:11 -0000 1.50
@@ -424,7 +424,7 @@
## begin gnulib module mbiter
-libgnu_a_SOURCES += mbiter.h
+libgnu_a_SOURCES += mbiter.h mbiter.c
## end gnulib module mbiter
@@ -486,7 +486,7 @@
## begin gnulib module mbuiter
-libgnu_a_SOURCES += mbuiter.h
+libgnu_a_SOURCES += mbuiter.h mbuiter.c
## end gnulib module mbuiter
@@ -823,6 +823,7 @@
-e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
-e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
-e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
Index: gnulib/lib/errno.in.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/errno.in.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnulib/lib/errno.in.h 6 Jul 2012 23:16:59 -0000 1.8
+++ gnulib/lib/errno.in.h 9 Nov 2012 16:36:11 -0000 1.9
@@ -270,5 +270,10 @@
# define GNULIB_defined_ENOTRECOVERABLE 1
# endif
+# ifndef EILSEQ
+# define EILSEQ 2015
+# define GNULIB_defined_EILSEQ 1
+# endif
+
#endif /* address@hidden@_ERRNO_H */
#endif /* address@hidden@_ERRNO_H */
Index: gnulib/lib/fcntl.in.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/fcntl.in.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnulib/lib/fcntl.in.h 15 May 2012 17:19:33 -0000 1.2
+++ gnulib/lib/fcntl.in.h 9 Nov 2012 16:36:11 -0000 1.3
@@ -216,6 +216,10 @@
# define O_EXEC O_RDONLY /* This is often close enough in older systems. */
#endif
+#ifndef O_IGNORE_CTTY
+# define O_IGNORE_CTTY 0
+#endif
+
#ifndef O_NDELAY
# define O_NDELAY 0
#endif
@@ -249,10 +253,18 @@
# define O_NOFOLLOW 0
#endif
+#ifndef O_NOLINK
+# define O_NOLINK 0
+#endif
+
#ifndef O_NOLINKS
# define O_NOLINKS 0
#endif
+#ifndef O_NOTRANS
+# define O_NOTRANS 0
+#endif
+
#ifndef O_RSYNC
# define O_RSYNC 0
#endif
@@ -269,7 +281,7 @@
# define O_TTY_INIT 0
#endif
-#if O_ACCMODE != (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
+#if ~O_ACCMODE & (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
# undef O_ACCMODE
# define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
#endif
Index: gnulib/lib/malloca.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/malloca.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnulib/lib/malloca.h 15 May 2012 17:19:34 -0000 1.6
+++ gnulib/lib/malloca.h 9 Nov 2012 16:36:11 -0000 1.7
@@ -42,7 +42,7 @@
and a page size can be as small as 4096 bytes. So we cannot safely
allocate anything larger than 4096 bytes. Also care for the possibility
of a few compiler-allocated temporary stack slots.
- This must be a macro, not an inline function. */
+ This must be a macro, not a function. */
# define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL)
#else
# define safe_alloca(N) ((void) (N), NULL)
Index: gnulib/lib/mbchar.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/mbchar.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnulib/lib/mbchar.c 15 May 2012 17:19:34 -0000 1.7
+++ gnulib/lib/mbchar.c 9 Nov 2012 16:36:12 -0000 1.8
@@ -16,6 +16,8 @@
#include <config.h>
+#define MBCHAR_INLINE _GL_EXTERN_INLINE
+
#include <limits.h>
#include "mbchar.h"
Index: gnulib/lib/mbchar.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/mbchar.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnulib/lib/mbchar.h 15 May 2012 17:19:34 -0000 1.11
+++ gnulib/lib/mbchar.h 9 Nov 2012 16:36:12 -0000 1.12
@@ -156,6 +156,11 @@
#include <wchar.h>
#include <wctype.h>
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBCHAR_INLINE
+# define MBCHAR_INLINE _GL_INLINE
+#endif
+
#define MBCHAR_BUF_SIZE 24
struct mbchar
@@ -235,7 +240,7 @@
/* Unprintable characters appear as a small box of width 1. */
#define MB_UNPRINTABLE_WIDTH 1
-static inline int
+MBCHAR_INLINE int
mb_width_aux (wint_t wc)
{
int w = wcwidth (wc);
@@ -256,7 +261,7 @@
(mbc)->wc = (mbc)->buf[0] = (sc))
/* Copying a character. */
-static inline void
+MBCHAR_INLINE void
mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
{
if (old_mbc->ptr == &old_mbc->buf[0])
@@ -304,7 +309,7 @@
extern const unsigned int is_basic_table[];
-static inline bool
+MBCHAR_INLINE bool
is_basic (char c)
{
return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31))
@@ -313,7 +318,7 @@
#else
-static inline bool
+MBCHAR_INLINE bool
is_basic (char c)
{
switch (c)
@@ -347,4 +352,6 @@
#endif
+_GL_INLINE_HEADER_END
+
#endif /* _MBCHAR_H */
Index: gnulib/lib/mbiter.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/mbiter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnulib/lib/mbiter.h 15 May 2012 17:19:34 -0000 1.4
+++ gnulib/lib/mbiter.h 9 Nov 2012 16:36:12 -0000 1.5
@@ -97,6 +97,11 @@
#include "mbchar.h"
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBITER_INLINE
+# define MBITER_INLINE _GL_INLINE
+#endif
+
struct mbiter_multi
{
const char *limit; /* pointer to end of string */
@@ -112,7 +117,7 @@
*/
};
-static inline void
+MBITER_INLINE void
mbiter_multi_next (struct mbiter_multi *iter)
{
if (iter->next_done)
@@ -172,14 +177,14 @@
iter->next_done = true;
}
-static inline void
+MBITER_INLINE void
mbiter_multi_reloc (struct mbiter_multi *iter, ptrdiff_t ptrdiff)
{
iter->cur.ptr += ptrdiff;
iter->limit += ptrdiff;
}
-static inline void
+MBITER_INLINE void
mbiter_multi_copy (struct mbiter_multi *new_iter, const struct mbiter_multi
*old_iter)
{
new_iter->limit = old_iter->limit;
@@ -212,4 +217,6 @@
/* Copying an iterator. */
#define mbi_copy mbiter_multi_copy
+_GL_INLINE_HEADER_END
+
#endif /* _MBITER_H */
Index: gnulib/lib/mbuiter.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/mbuiter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnulib/lib/mbuiter.h 15 May 2012 17:19:34 -0000 1.5
+++ gnulib/lib/mbuiter.h 9 Nov 2012 16:36:12 -0000 1.6
@@ -106,6 +106,11 @@
#include "mbchar.h"
#include "strnlen1.h"
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBUITER_INLINE
+# define MBUITER_INLINE _GL_INLINE
+#endif
+
struct mbuiter_multi
{
bool in_shift; /* true if next byte may not be interpreted as ASCII */
@@ -120,7 +125,7 @@
*/
};
-static inline void
+MBUITER_INLINE void
mbuiter_multi_next (struct mbuiter_multi *iter)
{
if (iter->next_done)
@@ -181,13 +186,13 @@
iter->next_done = true;
}
-static inline void
+MBUITER_INLINE void
mbuiter_multi_reloc (struct mbuiter_multi *iter, ptrdiff_t ptrdiff)
{
iter->cur.ptr += ptrdiff;
}
-static inline void
+MBUITER_INLINE void
mbuiter_multi_copy (struct mbuiter_multi *new_iter, const struct mbuiter_multi
*old_iter)
{
if ((new_iter->in_shift = old_iter->in_shift))
@@ -219,4 +224,6 @@
/* Copying an iterator. */
#define mbui_copy mbuiter_multi_copy
+_GL_INLINE_HEADER_END
+
#endif /* _MBUITER_H */
Index: gnulib/lib/stdlib.in.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/stdlib.in.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnulib/lib/stdlib.in.h 6 Jul 2012 23:17:00 -0000 1.15
+++ gnulib/lib/stdlib.in.h 9 Nov 2012 16:36:12 -0000 1.16
@@ -457,10 +457,19 @@
#if @GNULIB_PTSNAME@
/* Return the pathname of the pseudo-terminal slave associated with
the master FD is open on, or NULL on errors. */
+# if @REPLACE_PTSNAME@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef ptsname
+# define ptsname rpl_ptsname
+# endif
+_GL_FUNCDECL_RPL (ptsname, char *, (int fd));
+_GL_CXXALIAS_RPL (ptsname, char *, (int fd));
+# else
# if address@hidden@
_GL_FUNCDECL_SYS (ptsname, char *, (int fd));
# endif
_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
+# endif
_GL_CXXALIASWARN (ptsname);
#elif defined GNULIB_POSIXCHECK
# undef ptsname
Index: gnulib/lib/strerror-override.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/strerror-override.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnulib/lib/strerror-override.c 6 Jul 2012 23:17:00 -0000 1.3
+++ gnulib/lib/strerror-override.c 9 Nov 2012 16:36:12 -0000 1.4
@@ -291,6 +291,11 @@
return "State not recoverable";
#endif
+#if GNULIB_defined_EILSEQ
+ case EILSEQ:
+ return "Invalid or incomplete multibyte or wide character";
+#endif
+
default:
return NULL;
}
Index: gnulib/lib/strerror-override.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/strerror-override.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnulib/lib/strerror-override.h 6 Jul 2012 23:17:00 -0000 1.3
+++ gnulib/lib/strerror-override.h 9 Nov 2012 16:36:12 -0000 1.4
@@ -46,7 +46,8 @@
|| GNULIB_defined_EDQUOT \
|| GNULIB_defined_ECANCELED \
|| GNULIB_defined_EOWNERDEAD \
- || GNULIB_defined_ENOTRECOVERABLE
+ || GNULIB_defined_ENOTRECOVERABLE \
+ || GNULIB_defined_EILSEQ
extern const char *strerror_override (int errnum);
# else
# define strerror_override(ignored) NULL
Index: gnulib/lib/xalloc-oversized.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xalloc-oversized.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnulib/lib/xalloc-oversized.h 15 May 2012 17:19:37 -0000 1.2
+++ gnulib/lib/xalloc-oversized.h 9 Nov 2012 16:36:12 -0000 1.3
@@ -22,7 +22,7 @@
/* Return 1 if an array of N objects, each of size S, cannot exist due
to size arithmetic overflow. S must be positive and N must be
- nonnegative. This is a macro, not an inline function, so that it
+ nonnegative. This is a macro, not a function, so that it
works correctly even when SIZE_MAX < N.
By gnulib convention, SIZE_MAX represents overflow in size
Index: gnulib/m4/eealloc.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/eealloc.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnulib/m4/eealloc.m4 15 May 2012 17:19:38 -0000 1.5
+++ gnulib/m4/eealloc.m4 9 Nov 2012 16:36:12 -0000 1.6
@@ -1,4 +1,4 @@
-# eealloc.m4 serial 2
+# eealloc.m4 serial 3
dnl Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,7 +8,6 @@
[
AC_REQUIRE([gl_EEMALLOC])
AC_REQUIRE([gl_EEREALLOC])
- AC_REQUIRE([AC_C_INLINE])
])
AC_DEFUN([gl_EEMALLOC],
Index: gnulib/m4/errno_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/errno_h.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnulib/m4/errno_h.m4 6 Jul 2012 23:17:00 -0000 1.9
+++ gnulib/m4/errno_h.m4 9 Nov 2012 16:36:13 -0000 1.10
@@ -1,4 +1,4 @@
-# errno_h.m4 serial 11
+# errno_h.m4 serial 12
dnl Copyright (C) 2004, 2006, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -58,6 +58,9 @@
#if !defined ENOTRECOVERABLE
booboo
#endif
+#if !defined EILSEQ
+booboo
+#endif
],
[gl_cv_header_errno_h_complete=no],
[gl_cv_header_errno_h_complete=yes])
Index: gnulib/m4/gnulib-comp.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-comp.m4,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gnulib/m4/gnulib-comp.m4 21 Sep 2012 17:59:55 -0000 1.46
+++ gnulib/m4/gnulib-comp.m4 9 Nov 2012 16:36:13 -0000 1.47
@@ -48,6 +48,7 @@
# Code from module exitfail:
# Code from module extensions:
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ # Code from module extern-inline:
# Code from module fcntl-h:
# Code from module getopt-gnu:
# Code from module getopt-posix:
@@ -156,6 +157,7 @@
m4_ifdef([AM_XGETTEXT_OPTION],
[AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+ AC_REQUIRE([gl_EXTERN_INLINE])
gl_FCNTL_H
gl_FUNC_GETOPT_GNU
if test $REPLACE_GETOPT = 1; then
@@ -520,6 +522,7 @@
lib/malloca.valgrind
lib/mbchar.c
lib/mbchar.h
+ lib/mbiter.c
lib/mbiter.h
lib/mbrtowc.c
lib/mbscasecmp.c
@@ -530,6 +533,7 @@
lib/mbsstr.c
lib/mbswidth.c
lib/mbswidth.h
+ lib/mbuiter.c
lib/mbuiter.h
lib/memchr.c
lib/memchr.valgrind
@@ -590,6 +594,7 @@
m4/errno_h.m4
m4/error.m4
m4/extensions.m4
+ m4/extern-inline.m4
m4/fcntl-o.m4
m4/fcntl_h.m4
m4/getopt.m4
Index: gnulib/m4/lib-ld.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/lib-ld.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnulib/m4/lib-ld.m4 15 May 2012 17:19:39 -0000 1.5
+++ gnulib/m4/lib-ld.m4 9 Nov 2012 16:36:13 -0000 1.6
@@ -1,33 +1,39 @@
-# lib-ld.m4 serial 5 (gettext-0.18.2)
+# lib-ld.m4 serial 6
dnl Copyright (C) 1996-2003, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
AC_DEFUN([AC_LIB_PROG_LD_GNU],
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
+ acl_cv_prog_gnu_ld=yes
+ ;;
*)
- acl_cv_prog_gnu_ld=no ;;
+ acl_cv_prog_gnu_ld=no
+ ;;
esac])
with_gnu_ld=$acl_cv_prog_gnu_ld
])
-dnl From libtool-1.4. Sets the variable LD.
+dnl From libtool-2.4. Sets the variable LD.
AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
+[AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld [default=no]])],
+ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])dnl
+
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
@@ -40,10 +46,11 @@
|| PATH_SEPARATOR=';'
}
fi
+
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by GCC])
+ AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -53,11 +60,11 @@
esac
case $ac_prog in
# Accept absolute paths.
- [[\\/]* | [A-Za-z]:[\\/]*)]
- [re_direlt='/[^/][^/]*/\.\./']
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ [[\\/]]* | ?:[[\\/]]*)
+ re_direlt='/[[^/]][[^/]]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+ while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
@@ -78,23 +85,26 @@
fi
AC_CACHE_VAL([acl_cv_path_LD],
[if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
+ IFS="$acl_save_ifs"
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
acl_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
+ test "$with_gnu_ld" != no && break
+ ;;
*)
- test "$with_gnu_ld" != yes && break ;;
+ test "$with_gnu_ld" != yes && break
+ ;;
esac
fi
done
- IFS="$ac_save_ifs"
+ IFS="$acl_save_ifs"
else
acl_cv_path_LD="$LD" # Let the user override the test with a path.
fi])
Index: gnulib/m4/mbchar.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/mbchar.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnulib/m4/mbchar.m4 15 May 2012 17:19:40 -0000 1.8
+++ gnulib/m4/mbchar.m4 9 Nov 2012 16:36:13 -0000 1.9
@@ -1,4 +1,4 @@
-# mbchar.m4 serial 8
+# mbchar.m4 serial 9
dnl Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -10,5 +10,4 @@
AC_DEFUN([gl_MBCHAR],
[
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
- AC_REQUIRE([AC_C_INLINE])
])
Index: gnulib/m4/mbiter.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/mbiter.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnulib/m4/mbiter.m4 15 May 2012 17:19:40 -0000 1.5
+++ gnulib/m4/mbiter.m4 9 Nov 2012 16:36:13 -0000 1.6
@@ -1,4 +1,4 @@
-# mbiter.m4 serial 6
+# mbiter.m4 serial 7
dnl Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,6 @@
AC_DEFUN([gl_MBITER],
[
- AC_REQUIRE([AC_C_INLINE])
AC_REQUIRE([AC_TYPE_MBSTATE_T])
:
])
Index: gnulib/m4/stdlib_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/stdlib_h.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnulib/m4/stdlib_h.m4 15 May 2012 17:19:41 -0000 1.15
+++ gnulib/m4/stdlib_h.m4 9 Nov 2012 16:36:13 -0000 1.16
@@ -102,6 +102,7 @@
REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC])
REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC])
REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP])
+ REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME])
REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R])
REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV])
REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R])
Index: gnulib/m4/xsize.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/xsize.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnulib/m4/xsize.m4 15 May 2012 17:19:42 -0000 1.5
+++ gnulib/m4/xsize.m4 9 Nov 2012 16:36:13 -0000 1.6
@@ -1,4 +1,4 @@
-# xsize.m4 serial 4
+# xsize.m4 serial 5
dnl Copyright (C) 2003-2004, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,6 +8,5 @@
[
dnl Prerequisites of lib/xsize.h.
AC_REQUIRE([gl_SIZE_MAX])
- AC_REQUIRE([AC_C_INLINE])
AC_CHECK_HEADERS([stdint.h])
])
Index: texi2html/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.am,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- texi2html/Makefile.am 9 Apr 2011 00:10:43 -0000 1.85
+++ texi2html/Makefile.am 9 Nov 2012 16:36:13 -0000 1.86
@@ -195,7 +195,7 @@
# xgettext to change it), and msgexec doesn't like it and don't do anything.
# msgexec: present charset "CHARSET" is not a portable encoding name
i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
- $(MKDIR_P) i18n
+ $(mkdir_p) i18n
if test '$(USE_NLS)' = 'yes'; then \
for file in "$(srcdir)/$(po_document_dir)/po_document/"*".po"; do
lang=`basename "$$file" .po | sed 's/\..*//'`; \
test "$$lang" = 'en' && continue; \
@@ -207,7 +207,7 @@
fi
i18n_ref:
- $(MKDIR_P) i18n_ref
+ $(mkdir_p) i18n_ref
# Should be done manually, otherwise it is left after make distclean
# in a out of source build directory.
@@ -217,7 +217,7 @@
fi
#i18n/en: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
-# $(MKDIR_P) i18n
+# $(mkdir_p) i18n
# msgexec -i $< "$(srcdir)/gettext_to_separated.pl" |
"$(srcdir)/separated_to_hash.pl" en > $@
translations.pl: i18n/en.thl
@@ -234,7 +234,7 @@
rm -rf locales
for file in "$(srcdir)/$(po_document_dir)/po_document/"*.po; do \
basename=`basename "$$file" .po` ; \
- $(MKDIR_P) "locales/$$basename/LC_MESSAGES/" ; \
+ $(mkdir_p) "locales/$$basename/LC_MESSAGES/" ; \
if test '$(USE_NLS)' = 'yes'; then \
$(MSGFMT) "$$file" -o
"locales/$$basename/LC_MESSAGES/texi2html_document.mo" ; \
else \
@@ -254,9 +254,9 @@
-rm -rf locales i18n
install-data-local: i18n
- $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/i18n
+ $(mkdir_p) $(DESTDIR)$(pkgdatadir)/i18n
$(INSTALL_DATA) i18n/*.thl $(DESTDIR)$(pkgdatadir)/i18n
- $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
+ $(mkdir_p) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
$(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \
$(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale
@@ -264,10 +264,10 @@
$(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode
$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \
$(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
- $(MKDIR_P)
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
+ $(mkdir_p)
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
$(INSTALL_DATA)
$(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
- $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode
+ $(mkdir_p) $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode
$(INSTALL_DATA) $(srcdir)/lib/Text-Unidecode/lib/Text/Unidecode.pm \
$(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text
$(INSTALL_DATA) $(srcdir)/lib/Text-Unidecode/lib/Text/Unidecode/*.pm \
Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- tp/Makefile.am 17 May 2012 11:11:23 -0000 1.45
+++ tp/Makefile.am 9 Nov 2012 16:36:13 -0000 1.46
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.45 2012/05/17 11:11:23 pertusus Exp $
+# $Id: Makefile.am,v 1.46 2012/11/09 16:36:13 karl Exp $
# Makefile.am for texinfo/tp.
#
# Copyright 2011, 2012 Free Software Foundation, Inc.
@@ -200,14 +200,14 @@
| sed 's/ \+/\n/g' | cat - $< | sort > $@
maintain/catalog.xml: maintain/catalog.xml.in Makefile
- $(MKDIR_P) maintain
+ $(mkdir_p) maintain
sed -e 's|address@hidden@]|$(abs_top_srcdir)|' $< > $@
libsrcdir = $(srcdir)/maintain/lib
install-data-local:
- $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
+ $(mkdir_p) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
$(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
$(INSTALL_DATA) $(libsrcdir)/libintl-perl/lib/Locale/*.pm \
$(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale
@@ -215,10 +215,10 @@
$(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode
$(INSTALL_DATA) $(libsrcdir)/libintl-perl/lib/Locale/RecodeData/*.pm \
$(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
- $(MKDIR_P)
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
+ $(mkdir_p)
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
$(INSTALL_DATA)
$(libsrcdir)/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
- $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode
+ $(mkdir_p) $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode
$(INSTALL_DATA) $(libsrcdir)/Text-Unidecode/lib/Text/Unidecode.pm \
$(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text
$(INSTALL_DATA) $(libsrcdir)/Text-Unidecode/lib/Text/Unidecode/*.pm \
Index: gnulib/lib/mbiter.c
===================================================================
RCS file: gnulib/lib/mbiter.c
diff -N gnulib/lib/mbiter.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/lib/mbiter.c 9 Nov 2012 16:36:12 -0000 1.1
@@ -0,0 +1,3 @@
+#include <config.h>
+#define MBITER_INLINE _GL_EXTERN_INLINE
+#include "mbiter.h"
Index: gnulib/lib/mbuiter.c
===================================================================
RCS file: gnulib/lib/mbuiter.c
diff -N gnulib/lib/mbuiter.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/lib/mbuiter.c 9 Nov 2012 16:36:12 -0000 1.1
@@ -0,0 +1,3 @@
+#include <config.h>
+#define MBUITER_INLINE _GL_EXTERN_INLINE
+#include "mbuiter.h"
Index: gnulib/m4/extern-inline.m4
===================================================================
RCS file: gnulib/m4/extern-inline.m4
diff -N gnulib/m4/extern-inline.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/extern-inline.m4 9 Nov 2012 16:36:13 -0000 1.1
@@ -0,0 +1,57 @@
+dnl 'extern inline' a la ISO C99.
+
+dnl Copyright 2012 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_EXTERN_INLINE],
+[
+ AC_REQUIRE([AC_C_INLINE])
+ AH_VERBATIM([extern_inline],
+[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'.
+ _GL_EXTERN_INLINE is a portable alternative to 'extern inline'.
+ _GL_INLINE_HEADER_BEGIN contains useful stuff to put
+ in an include file, before uses of _GL_INLINE.
+ It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic,
+ when FOO is an inline function in the header; see
+ <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
+ _GL_INLINE_HEADER_END contains useful stuff to put
+ in the same include file, after uses of _GL_INLINE. */
+#if (__GNUC__ \
+ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+ : 199901L <= __STDC_VERSION__)
+# define _GL_INLINE inline
+# define _GL_EXTERN_INLINE extern inline
+#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+# if __GNUC_GNU_INLINE__
+ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
+# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
+# else
+# define _GL_INLINE extern inline
+# endif
+# define _GL_EXTERN_INLINE extern
+#else
+# define _GL_INLINE static inline
+# define _GL_EXTERN_INLINE static inline
+#endif
+
+#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
+# define _GL_INLINE_HEADER_CONST_PRAGMA
+# else
+# define _GL_INLINE_HEADER_CONST_PRAGMA \
+ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
+# endif
+# define _GL_INLINE_HEADER_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
+ _GL_INLINE_HEADER_CONST_PRAGMA
+# define _GL_INLINE_HEADER_END \
+ _Pragma ("GCC diagnostic pop")
+#else
+# define _GL_INLINE_HEADER_BEGIN
+# define _GL_INLINE_HEADER_END
+#endif])
+])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog configure.ac build-aux/compil...,
karl <=