-diff -Nur autoconf-2.58.orig/doc/autoconf.texi autoconf-2.58/doc/autoconf.texi
---- autoconf-2.58.orig/doc/autoconf.texi 2003-11-05 19:26:28.000000000 +0100
-+++ autoconf-2.58/doc/autoconf.texi 2003-11-05 19:29:40.054405552 +0100
-@@ -208,29 +208,19 @@
+--- autoconf-2.60/doc/autoconf.texi.orig 2006-06-27 23:03:21.858011250 +0200
++++ autoconf-2.60/doc/autoconf.texi 2006-06-27 23:04:06.268786750 +0200
+@@ -203,29 +203,19 @@
@end direntry
@titlepage
-@@ -270,7 +260,7 @@
+@@ -267,7 +257,7 @@
* Manual Configuration:: Selecting features that can't be guessed
* Site Configuration:: Local defaults for @command{configure}
* Running configure Scripts:: How to use the Autoconf output
* Obsolete Constructs:: Kept for backward compatibility
* Using Autotest:: Creating portable test suites
* FAQ:: Frequent Autoconf Questions, with answers
-@@ -290,10 +280,10 @@
+@@ -288,10 +278,10 @@
Making @command{configure} Scripts
* Writing configure.ac:: What to put in an Autoconf input file
Writing @file{configure.ac}
-@@ -326,7 +316,7 @@
+@@ -325,7 +315,7 @@
Configuration Header Files
* Header Templates:: Input for the configuration headers
* Autoheader Macros:: How to specify CPP templates
Existing Tests
-@@ -437,7 +427,7 @@
+@@ -441,7 +431,7 @@
Using @command{autom4te}
* Customizing autom4te:: Customizing the Autoconf package
Programming in M4sugar
-@@ -505,13 +495,13 @@
+@@ -548,13 +538,13 @@
* System Type:: Specifying the system type
* Sharing Defaults:: Setting site-wide defaults for @command{configure}
* Defining Variables:: Specifying the compiler etc.
* Obsolete Macros:: Backward compatibility macros
* Autoconf 1:: Tips for upgrading your files
* Autoconf 2.13:: Some fresher tips
-@@ -536,7 +526,7 @@
+@@ -579,7 +569,7 @@
* Using an Autotest Test Suite:: Autotest and the user
* Writing testsuite.at:: Autotest macros
* Making testsuite Scripts:: Using autom4te to create @command{testsuite}
Using an Autotest Test Suite
-@@ -843,7 +833,7 @@
+@@ -911,7 +901,7 @@
@item
- a shell script called @file{config.status} that, when run, will recreate
+ a shell script called @file{config.status} that, when run, recreates
-the files listed above (@pxref{config.status Invocation});
+the files listed above (@pxref{config.status});
@item
an optional shell script normally called @file{config.cache}
-@@ -903,10 +893,10 @@
+@@ -971,10 +961,10 @@
@menu
* Writing configure.ac:: What to put in an Autoconf input file
@end menu
@node Writing configure.ac
-@@ -922,7 +912,7 @@
+@@ -990,7 +980,7 @@
or specialized features, @file{configure.ac} might need to contain some
hand-crafted shell commands; see @ref{Portable Shell}. The
@command{autoscan} program can give you a good start in writing
Previous versions of Autoconf promoted the name @file{configure.in},
which is somewhat ambiguous (the tool needed to process this file is not
-@@ -1150,7 +1140,7 @@
+@@ -1244,7 +1234,7 @@
@end display
@section Using @command{autoscan} to Create @file{configure.ac}
@cindex @command{autoscan}
-@@ -1172,7 +1162,7 @@
+@@ -1266,7 +1256,7 @@
use a configuration header file, you must add a call to
@code{AC_CONFIG_HEADERS} (@pxref{Configuration Headers}). You might
also have to change or add some @code{#if} directives to your program in
information about a program that can help with that job).
When using @command{autoscan} to maintain a @file{configure.ac}, simply
-@@ -1211,7 +1201,7 @@
+@@ -1305,7 +1295,7 @@
Prepend @var{dir} to the include path. Multiple invocations accumulate.
@end table
@section Using @command{ifnames} to List Conditionals
@cindex @command{ifnames}
-@@ -1220,8 +1210,7 @@
+@@ -1314,8 +1304,7 @@
preprocessor conditionals. If a package has already been set up to have
some portability, @command{ifnames} can thus help you figure out what its
@command{configure} needs to check for. It may help fill in some gaps in a
@command{ifnames} scans all of the C source files named on the command line
(or the standard input, if none are given) and writes to the standard
-@@ -1243,7 +1232,7 @@
+@@ -1337,7 +1326,7 @@
Print the version number of Autoconf and exit.
@end table
@section Using @command{autoconf} to Create @command{configure}
@cindex @command{autoconf}
-@@ -1337,8 +1326,7 @@
+@@ -1431,8 +1420,7 @@
@cindex Macro invocation stack
Because @command{autoconf} uses @command{autom4te} behind the scenes, it
displays a back trace for errors, but not for warnings; if you want
@item --trace=@var{macro}[:@var{format}]
@itemx -t @var{macro}[:@var{format}]
-@@ -1350,7 +1338,7 @@
+@@ -1444,7 +1432,7 @@
The @var{format} is a regular string, with newlines if desired, and
several special escape codes. It defaults to @samp{$f:$l:$n:$%}; see
@item --initialization
@itemx -i
-@@ -1424,7 +1412,7 @@
+@@ -1518,7 +1506,7 @@
@end group
@end example
@section Using @command{autoreconf} to Update @command{configure} Scripts
@cindex @command{autoreconf}
-@@ -1709,8 +1697,8 @@
+@@ -1831,8 +1819,8 @@
source directory; @command{configure} checks for this file's existence to
make sure that the directory that it is told contains the source code in
fact does. Occasionally people accidentally specify the wrong directory
@end defmac
-@@ -1898,7 +1886,7 @@
+@@ -2037,7 +2025,7 @@
when used in @var{output}, or the standard input when used in the
@var{inputs}. You most probably don't need to use this in
@file{configure.ac}, but it is convenient when using the command line
+interface of @file{./config.status}, see @ref{config.status},
for more details.
- The @var{inputs} may be absolute or relative filenames. In the latter
-@@ -2521,7 +2509,7 @@
- @file{config.h} is considered up to date. @xref{Output}, for more
- information about @code{AC_OUTPUT}.
+ The @var{inputs} may be absolute or relative file names. In the latter
+@@ -2857,7 +2845,7 @@
+ so @file{config.status} ensures that @file{config.h} is considered up to
+ date. @xref{Output}, for more information about @code{AC_OUTPUT}.
-@xref{config.status Invocation}, for more examples of handling
+@xref{config.status}, for more examples of handling
configuration-related dependencies.
@node Configuration Headers
-@@ -2583,7 +2571,7 @@
+@@ -2941,7 +2929,7 @@
@menu
* Header Templates:: Input for the configuration headers
* Autoheader Macros:: How to specify CPP templates
@end menu
-@@ -2637,10 +2625,10 @@
+@@ -2996,10 +2984,10 @@
comments in preprocessor macros has never been a good idea.
Since it is a tedious task to keep a template header up to date, you may
@subsection Using @command{autoheader} to Create @file{config.h.in}
@cindex @command{autoheader}
-@@ -6948,7 +6936,7 @@
- files will depend upon @command{bizarre-cc} being the C compiler. If
+@@ -8289,7 +8277,7 @@
+ files depend upon @command{bizarre-cc} being the C compiler. If
for some reason the user runs @command{./configure} again, or if it is
run via @samp{./config.status --recheck}, (@xref{Automatic Remaking},
-and @pxref{config.status Invocation}), then the configuration can be
inconsistent, composed of results depending upon two different
compilers.
-@@ -7000,7 +6988,7 @@
+@@ -8341,7 +8329,7 @@
@item
@var{variable} is kept during automatic reconfiguration
line argument, including when no cache is used:
@example
-@@ -7871,11 +7859,11 @@
+@@ -9258,11 +9246,11 @@
It supports M4 extensions designed for use in tools like Autoconf.
@menu
@subsection Invoking @command{autom4te}
The command line arguments are modeled after M4's:
-@@ -8158,7 +8146,7 @@
+@@ -9520,7 +9508,7 @@
not.
@end table
@item --preselect=@var{macro}
@itemx -p @var{macro}
-@@ -8232,8 +8220,8 @@
+@@ -9608,8 +9596,8 @@
wrapped in between a @samp{begin-language: "@var{language}"},
@samp{end-language: "@var{language}"} pair.
more generally arguments, are introduced by @samp{args:
@var{arguments}}. You may use the traditional shell syntax to quote the
@var{arguments}.
-@@ -8662,7 +8650,7 @@
+@@ -10305,7 +10293,7 @@
When the user runs @samp{autoconf -W error}, warnings from
@code{AC_DIAGNOSE} and @code{AC_WARNING} are reported as error, see
@node Dependencies Between Macros
@section Dependencies Between Macros
-@@ -12729,7 +12717,7 @@
+@@ -15688,7 +15676,7 @@
* System Type:: Specifying the system type
* Sharing Defaults:: Setting site-wide defaults for @command{configure}
* Defining Variables:: Specifying the compiler etc.
@end menu
@set autoconf
-@@ -12738,7 +12726,7 @@
+@@ -15697,7 +15685,7 @@
@c ============================================== Recreating a Configuration
@chapter Recreating a Configuration
@cindex @command{config.status}
-@@ -12878,7 +12866,7 @@
+@@ -15842,7 +15830,7 @@
@menu
* Obsolete config.status Use:: Different calling convention
* acconfig.h:: Additional entries in @file{config.h.in}
* Obsolete Macros:: Backward compatibility macros
* Autoconf 1:: Tips for upgrading your files
* Autoconf 2.13:: Some fresher tips
-@@ -12888,7 +12876,7 @@
+@@ -15852,7 +15840,7 @@
@section Obsolete @file{config.status} Invocation
@file{config.status} now supports arguments to specify the files to
Before, environment variables had to be used.
@defvar CONFIG_COMMANDS
-@@ -12919,7 +12907,7 @@
+@@ -15883,7 +15871,7 @@
@file{config.status} ignores this variable.
@end defvar
would be:
@example
-@@ -12993,7 +12981,7 @@
+@@ -15957,7 +15945,7 @@
self-contained, and should not depend upon @file{acconfig.h} etc.
@section Using @command{autoupdate} to Modernize @file{configure.ac}
@cindex @command{autoupdate}
-@@ -13929,7 +13917,7 @@
+@@ -16944,7 +16932,7 @@
If you have an @file{aclocal.m4} installed with Autoconf (as opposed to
in a particular package's source directory), you must rename it to
+@file{acsite.m4}. @xref{autoconf}.
If you distribute @file{install.sh} with your package, rename it to
- @file{install-sh} so @code{make} builtin rules won't inadvertently
-@@ -13984,7 +13972,7 @@
+ @file{install-sh} so @code{make} builtin rules don't inadvertently
+@@ -16999,7 +16987,7 @@
the documentation for them. @xref{Obsolete Macros}, for a table showing the
new names for the old macros. Use the @command{autoupdate} program to
convert your @file{configure.ac} to using the new macro names.
Some macros have been superseded by similar ones that do the job better,
but are not call-compatible. If you get warnings about calling obsolete
-@@ -14549,7 +14537,7 @@
+@@ -17535,7 +17523,7 @@
@menu
* Using an Autotest Test Suite:: Autotest and the user
* Writing testsuite.at:: Autotest macros
* Making testsuite Scripts:: Using autom4te to create @command{testsuite}
@end menu
-@@ -14611,7 +14599,7 @@
+@@ -17597,7 +17585,7 @@
@itemize @bullet
@item a debugging script named @file{run} which reruns the test in
of debugging scripts has the purpose of easing the chase for bugs.
@item all the files created with @code{AT_DATA}
-@@ -14833,7 +14821,7 @@
+@@ -17836,7 +17824,7 @@
@end defmac
@section Running @command{testsuite} Scripts
@cindex @command{testsuite}
-@@ -14976,7 +14964,7 @@
+@@ -17996,7 +17984,7 @@
An Autotest test suite is to be configured in @var{directory}. This
macro requires the instantiation of @file{@var{directory}/atconfig} from
@file{@var{directory}/atconfig.in}, and sets the default
@end defmac
@item
-@@ -15306,7 +15294,7 @@
- which can be a very long process for complex @file{configure.ac}.
+@@ -18346,7 +18334,7 @@
+ which can be a long process for complex @file{configure.ac}.
This is why all these tools, instead of running directly M4, invoke
-@command{autom4te} (@pxref{autom4te Invocation}) which, while answering to
+@command{autom4te} (@pxref{autom4te}) which, while answering to
a specific demand, stores additional information in
@file{autom4te.cache} for future runs. For instance, if you run
- @command{autoconf}, behind the scenes, @command{autom4te} will also
+ @command{autoconf}, behind the scenes, @command{autom4te} also
diff -Nur autoconf-2.58.orig/doc/install.texi autoconf-2.58/doc/install.texi
--- autoconf-2.58.orig/doc/install.texi 2002-08-27 10:28:06.000000000 +0200
+++ autoconf-2.58/doc/install.texi 2003-11-05 19:26:39.414866936 +0100
---- autoconf-2.59/lib/autoconf/libs.m4.orig 2003-05-22 14:05:13.000000000 +0200
-+++ autoconf-2.59/lib/autoconf/libs.m4 2006-02-18 16:45:40.815890250 +0100
-@@ -180,7 +180,8 @@
- # Internal subroutine of _AC_PATH_X.
- # Set ac_x_includes and/or ac_x_libraries.
- m4_define([_AC_PATH_X_XMKMF],
--[rm -fr conftest.dir
-+[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl
-+rm -f -r conftest.dir
- if mkdir conftest.dir; then
- cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-@@ -188,7 +189,7 @@
- acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
- _ACEOF
-- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-@@ -202,7 +203,7 @@
- # bogus both because they are the default anyway, and because
- # using them would break gcc on systems where it needs fixed includes.
- case $ac_im_incroot in
-- /usr/include) ;;
-+ /usr/include) ac_x_includes= ;;
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
- esac
- case $ac_im_usrlibdir in
-@@ -259,13 +260,13 @@
- /usr/openwin/share/include'
-
- if test "$ac_x_includes" = no; then
-- # Guess where to find include files, by looking for Intrinsic.h.
-+ # Guess where to find include files, by looking for Xlib.h.
- # First, try using that file with no special directory specified.
-- AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
-+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
- [# We can compile using X headers with no special include directory.
- ac_x_includes=],
- [for ac_dir in $ac_x_header_dirs; do
-- if test -r "$ac_dir/X11/Intrinsic.h"; then
-+ if test -r "$ac_dir/X11/Xlib.h"; then
- ac_x_includes=$ac_dir
- break
- fi
-@@ -277,9 +278,9 @@
+--- autoconf-2.60/lib/autoconf/libs.m4.orig 2006-05-29 19:46:05.000000000 +0200
++++ autoconf-2.60/lib/autoconf/libs.m4 2006-06-27 23:08:13.328227000 +0200
+@@ -288,7 +288,7 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
-- AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
-- [XtMalloc (0)])],
+ LIBS="-lX11 $LIBS"
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
-+ [XrmInitialize ()])],
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
+ [XrmInitialize ()])],
[LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=],
-@@ -288,7 +289,7 @@
+@@ -299,7 +299,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
-- if test -r $ac_dir/libXt.$ac_extension; then
-+ if test -r $ac_dir/libX11.$ac_extension; then
+- if test -r "$ac_dir/libXt.$ac_extension"; then
++ if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
fi
projects / packages / autoconf.git / commitdiff