Merge from gnulib.
This commit is contained in:
Paul Eggert
parent
d01ba2f149
commit
2f93ecceb9
6 changed files with 43 additions and 11 deletions
|
|
@ -1,5 +1,8 @@
|
|||
2012-07-09 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Merge from gnulib, incorporating:
|
||||
2012-07-09 timespec: mark functions with const attributes
|
||||
|
||||
Rename configure.in to configure.ac (Bug#11603).
|
||||
The name 'configure.in' has been obsolescent for quite some time,
|
||||
and the next release of Autoconf will generate warnings for it.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
% Load plain if necessary, i.e., if running under initex.
|
||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||
%
|
||||
\def\texinfoversion{2012-06-05.14}
|
||||
\def\texinfoversion{2012-07-03.16}
|
||||
%
|
||||
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
|
|
@ -4206,7 +4206,7 @@
|
|||
}
|
||||
\def\ifsetfail{\doignore{ifset}}
|
||||
|
||||
% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
|
||||
% @ifclear VAR ... @end executes the `...' iff VAR has never been
|
||||
% defined with @set, or has been undefined with @clear.
|
||||
%
|
||||
% The `\else' inside the `\doifset' parameter is a trick to reuse the
|
||||
|
|
@ -4217,6 +4217,35 @@
|
|||
\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
|
||||
\def\ifclearfail{\doignore{ifclear}}
|
||||
|
||||
% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written
|
||||
% without the @) is in fact defined. We can only feasibly check at the
|
||||
% TeX level, so something like `mathcode' is going to considered
|
||||
% defined even though it is not a Texinfo command.
|
||||
%
|
||||
\makecond{ifcommanddefined}
|
||||
\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
|
||||
%
|
||||
\def\doifcmddefined#1#2{{%
|
||||
\makevalueexpandable
|
||||
\let\next=\empty
|
||||
\expandafter\ifx\csname #2\endcsname\relax
|
||||
#1% If not defined, \let\next as above.
|
||||
\fi
|
||||
\expandafter
|
||||
}\next
|
||||
}
|
||||
\def\ifcmddefinedfail{\doignore{ifcommanddefined}}
|
||||
|
||||
% @ifcommandnotdefined CMD ... handlded similar to @ifclear above.
|
||||
\makecond{ifcommandnotdefined}
|
||||
\def\ifcommandnotdefined{%
|
||||
\parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}
|
||||
\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}}
|
||||
|
||||
% Set the `txicommandconditionals' variable, so documents have a way to
|
||||
% test if the @ifcommand...defined conditionals are available.
|
||||
\set txicommandconditionals
|
||||
|
||||
% @dircategory CATEGORY -- specify a category of the dir file
|
||||
% which this file should belong to. Ignore this in TeX.
|
||||
\let\dircategory=\comment
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
macro that comes with autoconf 2.13 or newer.
|
||||
If that isn't an option, then just put
|
||||
AC_CHECK_FUNCS(pstat_getdynamic) in your
|
||||
configure.in file.
|
||||
configure.ac file.
|
||||
HAVE_LIBPERFSTAT Define this if your system has the
|
||||
perfstat_cpu_total function in libperfstat (AIX).
|
||||
FIXUP_KERNEL_SYMBOL_ADDR() Adjust address in returned struct nlist.
|
||||
|
|
|
|||
|
|
@ -65,9 +65,12 @@ timespec_sign (struct timespec a)
|
|||
return a.tv_sec < 0 ? -1 : a.tv_sec || a.tv_nsec;
|
||||
}
|
||||
|
||||
struct timespec timespec_add (struct timespec, struct timespec);
|
||||
struct timespec timespec_sub (struct timespec, struct timespec);
|
||||
struct timespec dtotimespec (double);
|
||||
struct timespec timespec_add (struct timespec, struct timespec)
|
||||
_GL_ATTRIBUTE_CONST;
|
||||
struct timespec timespec_sub (struct timespec, struct timespec)
|
||||
_GL_ATTRIBUTE_CONST;
|
||||
struct timespec dtotimespec (double)
|
||||
_GL_ATTRIBUTE_CONST;
|
||||
|
||||
/* Return an approximation to A, of type 'double'. */
|
||||
static inline double
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ AC_DEFUN([gl_FUNC_GETOPT_GNU],
|
|||
AC_REQUIRE([gl_FUNC_GETOPT_POSIX])
|
||||
])
|
||||
|
||||
# emacs' configure.in uses this.
|
||||
AC_DEFUN([gl_GETOPT_IFELSE],
|
||||
[
|
||||
AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
|
||||
|
|
@ -360,7 +359,6 @@ dnl is ambiguous with environment values that contain newlines.
|
|||
fi
|
||||
])
|
||||
|
||||
# emacs' configure.in uses this.
|
||||
AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
|
||||
[
|
||||
GETOPT_H=getopt.h
|
||||
|
|
@ -371,7 +369,6 @@ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
|
|||
])
|
||||
|
||||
# Prerequisites of lib/getopt*.
|
||||
# emacs' configure.in uses this.
|
||||
AC_DEFUN([gl_PREREQ_GETOPT],
|
||||
[
|
||||
AC_CHECK_DECLS_ONCE([getenv])
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
# other built files.
|
||||
|
||||
|
||||
# This macro should be invoked from ./configure.in, in the section
|
||||
# This macro should be invoked from ./configure.ac, in the section
|
||||
# "Checks for programs", right after AC_PROG_CC, and certainly before
|
||||
# any checks for libraries, header files, types and library functions.
|
||||
AC_DEFUN([gl_EARLY],
|
||||
|
|
@ -118,7 +118,7 @@ AC_DEFUN([gl_EARLY],
|
|||
# Code from module warnings:
|
||||
])
|
||||
|
||||
# This macro should be invoked from ./configure.in, in the section
|
||||
# This macro should be invoked from ./configure.ac, in the section
|
||||
# "Check for header files, types and library functions".
|
||||
AC_DEFUN([gl_INIT],
|
||||
[
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue