* Paul Eggert wrote on Sat, May 14, 2005 at 08:01:24PM CEST:
> Ralf Wildenhues <[EMAIL PROTECTED]> writes:
>
> > I was one who argued for this, so I volunteer to produce a patch for
> > (2), if there are chances that it will be accepted.
>
> Yes, I'd like to have the manual be consistent.
OK.
> Rather than doing it all at once, though, perhaps you could do two or
> three examples first, to make sure we're all on the same page here.
When I read this, I was almost through anyway, so here goes it all. :-)
While at it, I also took liberty to fix many overlong lines in the dvi
output (the `make' chapter is one important exception; its high
indentation makes it very hard to write decently there), and add a
couple of comments to improve texi highlighting in vim.
In order to give a quick overview of the changes, they are broken down
in several patches:
- hunks with simple added quotes only,
- quotes which also add [] to otherwise empty arguments,
- added quotes which refer to either old macros or directly to pieces of
Autoconf code (and may thus be technically incorrect),
- highlighting helper comments,
- removal of many overfull/underfull hboxes.
You may want to check the third patch and the last patch in more detail,
as the last one actually changes content (plus adds a few [] as well),
and I am known to produce incorrect English at times. :)
I have deliberately not touched on the subject of double quotes (for
example for C code snippets), however that would need a check as well,
but I was unsure about the rules to apply there. They are easy to find
quickly, though.
Of couse, my patches (hopefully) should not touch any macro definition
or any examples which point out old or wrong-quoted code.
If you *really* want me to, I could write detailed ChangeLog entries.
But I'd rather not, and I figured I'd at least wait to see which parts
you actually want.
Regards,
Ralf
* doc/autoconf.texi (all over the map): Single-quote macro
arguments consistently.
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.897
diff -u -r1.897 autoconf.texi
--- doc/autoconf.texi 10 May 2005 23:37:37 -0000 1.897
+++ doc/autoconf.texi 15 May 2005 03:25:37 -0000
@@ -1108,9 +1108,9 @@
three lines below are equivalent:
@example
-AC_CHECK_HEADERS(stdio.h, [], [], [])
-AC_CHECK_HEADERS(stdio.h,,,)
-AC_CHECK_HEADERS(stdio.h)
+AC_CHECK_HEADERS([stdio.h], [], [], [])
+AC_CHECK_HEADERS([stdio.h],,,)
+AC_CHECK_HEADERS([stdio.h])
@end example
It is best to put each macro call on its own line in
@@ -1679,7 +1679,7 @@
error output and exit with failure (exit status is 63). For example:
@example
-AC_PREREQ(@value{VERSION})
+AC_PREREQ([EMAIL PROTECTED])
@end example
This macro is the only macro that may be used before @code{AC_INIT}, but
@@ -1712,7 +1712,7 @@
@c The asis prevents RCS from changing the example in the manual.
@example
-AC_REVISION([EMAIL PROTECTED]: 1.30 }$)
+AC_REVISION([EMAIL PROTECTED]: 1.30 }$])
@end example
@noindent
@@ -1915,15 +1915,15 @@
@example
@dots{} && my_foos="$my_foos fooo"
@dots{} && my_foos="$my_foos foooo"
-AC_CONFIG_FOOS($my_foos)
+AC_CONFIG_FOOS([$my_foos])
@end example
@noindent
and use this instead:
@example
[EMAIL PROTECTED] && AC_CONFIG_FOOS(fooo)
[EMAIL PROTECTED] && AC_CONFIG_FOOS(foooo)
[EMAIL PROTECTED] && AC_CONFIG_FOOS([fooo])
[EMAIL PROTECTED] && AC_CONFIG_FOOS([foooo])
@end example
The macros @code{AC_CONFIG_FILES} and @code{AC_CONFIG_HEADERS} use
@@ -1932,7 +1932,7 @@
from its templates, @var{inputs} (defaulting to @[EMAIL PROTECTED]).
For instance
[EMAIL PROTECTED](Makefile:boiler/top.mk:boiler/bot.mk)} asks for
[EMAIL PROTECTED]([Makefile:boiler/top.mk:boiler/bot.mk)]} asks for
the creation of @file{Makefile} that will be the expansion of the
output variables in the concatenation of @file{boiler/top.mk} and
@file{boiler/bot.mk}.
@@ -2441,7 +2441,7 @@
A corollary is that you should not use these variables except in
Makefiles. For instance, instead of trying to evaluate @code{datadir}
in @file{configure} and hard-coding it in Makefiles using
-e.g., @samp{AC_DEFINE_UNQUOTED(DATADIR, "$datadir", [Data directory.])},
+e.g., @samp{AC_DEFINE_UNQUOTED([DATADIR], ["$datadir"], [Data directory.])},
you should add
@samp{-DDATADIR="$(datadir)"} to your @code{CPPFLAGS}.
@@ -2750,7 +2750,7 @@
The @command{autoheader} program can create a template file of C
@samp{#define} statements for @command{configure} to use. If
[EMAIL PROTECTED] invokes @code{AC_CONFIG_HEADERS(@var{file})},
[EMAIL PROTECTED] invokes @code{AC_CONFIG_HEADERS([EMAIL PROTECTED])},
@command{autoheader} creates @[EMAIL PROTECTED]; if multiple file
arguments are given, the first one is used. Otherwise,
@command{autoheader} creates @file{config.h.in}.
@@ -2857,7 +2857,7 @@
templates, @command{autoheader} fails with an error message.
The simplest way to create a template for a @var{symbol} is to supply
-the @var{description} argument to an @samp{AC_DEFINE(@var{symbol})}; see
+the @var{description} argument to an @samp{AC_DEFINE([EMAIL PROTECTED])}; see
@ref{Defining Symbols}. You may also use one of the following macros.
@defmac AH_VERBATIM (@var{key}, @var{template})
@@ -2991,8 +2991,8 @@
For example, this call:
@example
-AC_CONFIG_LINKS(host.h:config/$machine.h
- object.h:config/$obj_format.h)
+AC_CONFIG_LINKS([host.h:config/$machine.h
+ object.h:config/$obj_format.h])
@end example
@noindent
@@ -3035,7 +3035,7 @@
if test "$package_foo_enabled" = yes; then
$my_subdirs="$my_subdirs foo"
fi
-AC_CONFIG_SUBDIRS($my_subdirs)
+AC_CONFIG_SUBDIRS([$my_subdirs])
@end example
@noindent
@@ -3045,7 +3045,7 @@
@example
if test "$package_foo_enabled" = yes; then
- AC_CONFIG_SUBDIRS(foo)
+ AC_CONFIG_SUBDIRS([foo])
fi
@end example
@@ -3054,7 +3054,7 @@
@example
if test -d $srcdir/foo; then
- AC_CONFIG_SUBDIRS(foo)
+ AC_CONFIG_SUBDIRS([foo])
fi
@end example
@@ -3196,7 +3196,7 @@
For instance,
@example
-AC_CHECK_TYPES(struct $Expensive*)
+AC_CHECK_TYPES([struct $Expensive*])
@end example
@noindent
@@ -3416,8 +3416,8 @@
AC_PROG_LEX
if test "$LEX" != flex; then
LEX="$SHELL $missing_dir/missing flex"
- AC_SUBST(LEX_OUTPUT_ROOT, lex.yy)
- AC_SUBST(LEXLIB, '')
+ AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
+ AC_SUBST([LEXLIB], [''])
fi
@end example
@@ -3550,7 +3550,7 @@
For example, if the user runs @samp{configure --host=i386-gnu}, then
this call:
@example
-AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL([RANLIB], [ranlib], [:])
@end example
@noindent
sets @code{RANLIB} to @file{i386-gnu-ranlib} if that program exists in
@@ -3688,8 +3688,8 @@
appear the standard C library on some hosts, and in special libraries
like @code{nsl} on other hosts. On some hosts the special libraries
contain variant implementations that you may not want to use. These
-days it is normally better to use @code{AC_SEARCH_LIBS(gethostbyname,
-nsl)} instead of @code{AC_CHECK_LIB(nsl, gethostbyname)}.
+days it is normally better to use @code{AC_SEARCH_LIBS([gethostbyname],
+[nsl])} instead of @code{AC_CHECK_LIB([nsl], [gethostbyname])}.
@end defmac
@@ -4580,9 +4580,9 @@
@code{"foo"} or @code{"bar"}, you should do:
@example
-AC_LIBSOURCE(foo.c)
-AC_LIBSOURCE(bar.c)
-AC_LIBOBJ($foo_or_bar)
+AC_LIBSOURCE([foo.c])
+AC_LIBSOURCE([bar.c])
+AC_LIBOBJ([$foo_or_bar])
@end example
@noindent
@@ -4601,7 +4601,7 @@
@example
AC_LIBSOURCES([foo.c, bar.c])
-AC_LIBOBJ($foo_or_bar)
+AC_LIBOBJ([$foo_or_bar])
@end example
@end defmac
@@ -4611,7 +4611,7 @@
@var{directory}, a name relative to the top level of the
source tree. The replacement directory defaults to @file{.}, the top
level directory, and the most typical value is @file{lib}, corresponding
-to @samp{AC_CONFIG_LIBOBJ_DIR(lib)}.
+to @samp{AC_CONFIG_LIBOBJ_DIR([lib])}.
@command{configure} might need to know the replacement directory for the
following reasons: (i) some checks use the replacement files, (ii) some
@@ -4938,7 +4938,7 @@
@example
AC_HEADER_STDC
-AC_CHECK_FUNCS(strchr memcpy)
+AC_CHECK_FUNCS([strchr memcpy])
@end example
@noindent
@@ -4969,7 +4969,7 @@
way to incorporate your implementations only when needed (since the ones
in system C libraries may be hand optimized) is to, taking @code{memchr}
for example, put it in @file{memchr.c} and use
[EMAIL PROTECTED](memchr)}.
[EMAIL PROTECTED]([memchr])}.
@end defmac
@defmac AC_HEADER_SYS_WAIT
@@ -5035,7 +5035,7 @@
example, @code{struct timeval} as well as
@code{struct tm}. It is best used in conjunction with
@code{HAVE_SYS_TIME_H}, which can be checked for using
[EMAIL PROTECTED](sys/time.h)}.
[EMAIL PROTECTED]([sys/time.h])}.
@example
@group
@@ -5189,7 +5189,7 @@
This macro uses an m4 list as first argument:
@example
-AC_CHECK_DECLS(strdup)
+AC_CHECK_DECLS([strdup])
AC_CHECK_DECLS([strlen])
AC_CHECK_DECLS([malloc, realloc, calloc, free])
@end example
@@ -5463,7 +5463,7 @@
This macro uses m4 lists:
@example
-AC_CHECK_TYPES(ptrdiff_t)
+AC_CHECK_TYPES([ptrdiff_t])
AC_CHECK_TYPES([unsigned long long int, uintmax_t])
@end example
@@ -5559,7 +5559,7 @@
For example, the call
@example
-AC_CHECK_SIZEOF(int *)
+AC_CHECK_SIZEOF([int *])
@end example
@noindent
@@ -5667,7 +5667,7 @@
this:
@example
-AC_PROG_CC(cl egcs gcc cc)
+AC_PROG_CC([cl egcs gcc cc])
@end example
If the C compiler is not in @acronym{ANSI} mode by default, try to add an
@@ -5975,7 +5975,7 @@
like this:
@example
-AC_PROG_CXX(cl KCC CC cxx cc++ xlC aCC c++ g++ egcs gcc)
+AC_PROG_CXX([cl KCC CC cxx cc++ xlC aCC c++ g++ egcs gcc])
@end example
If using the @acronym{GNU} C++ compiler, set shell variable @code{GXX} to
@@ -6038,7 +6038,7 @@
@code{AC_PROG_F77} like this:
@example
-AC_PROG_F77(fl32 f77 fort77 xlf g77 f90 xlf90)
+AC_PROG_F77([fl32 f77 fort77 xlf g77 f90 xlf90])
@end example
If using @code{g77} (the @acronym{GNU} Fortran 77 compiler), then
@@ -6094,7 +6094,7 @@
To check for characteristics not listed here, use
@code{AC_COMPILE_IFELSE} (@pxref{Running the Compiler}) or
@code{AC_RUN_IFELSE} (@pxref{Run Time}), making sure to first set the
-current language to Fortran 77 or Fortran via @code{AC_LANG(Fortran 77)}
+current language to Fortran 77 or Fortran via @code{AC_LANG([Fortran 77])}
or @code{AC_LANG(Fortran)} (@pxref{Language Choice}).
@@ -6600,10 +6600,10 @@
[EMAIL PROTECTED]), since Autoconf will detect inconsistencies.
@example
-AC_LANG_PUSH(Fortran 77)
+AC_LANG_PUSH([Fortran 77])
# Perform some tests on Fortran 77.
# @dots{}
-AC_LANG_POP(Fortran 77)
+AC_LANG_POP([Fortran 77])
@end example
@end defmac
@@ -6768,7 +6768,7 @@
For instance executing (observe the double quotation!):
@example
-AC_INIT(Autoconf Documentation, @value{VERSION}, bug-autoconf@@gnu.org)
+AC_INIT([Autoconf Documentation], [EMAIL PROTECTED], [bug-autoconf@@gnu.org])
AC_DEFINE([HELLO_WORLD], ["Hello, World\n"],
[Greetings string.])
AC_LANG_CONFTEST(
@@ -6807,7 +6807,7 @@
For instance:
@example
-AC_INIT(Autoconf Documentation, @value{VERSION}, bug-autoconf@@gnu.org)
+AC_INIT([Autoconf Documentation], [EMAIL PROTECTED], [bug-autoconf@@gnu.org])
AC_DEFINE([HELLO_WORLD], ["Hello, World\n"],
[Greetings string.])
AC_LANG_CONFTEST(
@@ -6900,7 +6900,7 @@
For instance:
@example
-AC_INIT(Autoconf Documentation, @value{VERSION}, bug-autoconf@@gnu.org)
+AC_INIT([Autoconf Documentation], [EMAIL PROTECTED], [bug-autoconf@@gnu.org])
AC_DEFINE([HELLO_WORLD], ["Hello, World\n"],
[Greetings string.])
AC_PREPROC_IFELSE(
@@ -7159,20 +7159,20 @@
# The order of these tests is important.
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/statvfs.h>
#include <sys/fstyp.h>]])],
- [AC_DEFINE(FSTYPE_STATVFS, 1,
+ [AC_DEFINE([FSTYPE_STATVFS], [1],
[Define if statvfs exists.])
fstype=SVR4])
if test $fstype = no; then
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/statfs.h>
#include <sys/fstyp.h>]])],
- [AC_DEFINE(FSTYPE_USG_STATFS, 1,
+ [AC_DEFINE([FSTYPE_USG_STATFS], [1],
[Define if USG statfs.])
fstype=SVR3])
fi
if test $fstype = no; then
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/statfs.h>
#include <sys/vmount.h>]])]),
- [AC_DEFINE(FSTYPE_AIX_STATFS, 1,
+ [AC_DEFINE([FSTYPE_AIX_STATFS], [1],
[Define if AIX statfs.])
fstype=AIX])
fi
@@ -7215,10 +7215,10 @@
appropriate cache variable, as in this example:
@example
-AC_CHECK_FUNC(vprintf, [AC_DEFINE(HAVE_VPRINTF, 1,
+AC_CHECK_FUNC([vprintf], [AC_DEFINE([HAVE_VPRINTF], [1],
[Define if vprintf exists.])])
if test "$ac_cv_func_vprintf" != yes; then
- AC_CHECK_FUNC(_doprnt, [AC_DEFINE(HAVE_DOPRNT, 1,
+ AC_CHECK_FUNC([_doprnt], [AC_DEFINE([HAVE_DOPRNT], [1],
[Define if _doprnt exists.])])
fi
@end example
@@ -7244,7 +7244,7 @@
@code{EQUATION} to be the string constant @samp{"$a > $b"}:
@example
-AC_DEFINE(EQUATION, "$a > $b",
+AC_DEFINE([EQUATION], ["$a > $b"],
[Equation string.])
@end example
@@ -7265,11 +7265,11 @@
@var{variable} or @var{value} is a shell variable. Examples:
@example
-AC_DEFINE_UNQUOTED(config_machfile, "$machfile",
+AC_DEFINE_UNQUOTED([config_machfile], ["$machfile"],
[Configuration machine file.])
-AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups,
+AC_DEFINE_UNQUOTED([GETGROUPS_T], [$ac_cv_type_getgroups],
[getgroups return type.])
-AC_DEFINE_UNQUOTED($ac_tr_hdr, 1,
+AC_DEFINE_UNQUOTED([$ac_tr_hdr], [1],
[Translated header name.])
@end example
@end defmac
@@ -7281,16 +7281,16 @@
newlines. That is, do this:
@example
-AC_CHECK_HEADER(elf.h,
- [AC_DEFINE(SVR4, 1, [System V Release 4]) LIBS="$LIBS -lelf"])
+AC_CHECK_HEADER([elf.h],
+ [AC_DEFINE([SVR4], [1], [System V Release 4]) LIBS="$LIBS -lelf"])
@end example
@noindent
or this:
@example
-AC_CHECK_HEADER(elf.h,
- [AC_DEFINE(SVR4, 1, [System V Release 4])
+AC_CHECK_HEADER([elf.h],
+ [AC_DEFINE([SVR4], [1], [System V Release 4])
LIBS="$LIBS -lelf"])
@end example
@@ -7298,8 +7298,8 @@
instead of this:
@example
-AC_CHECK_HEADER(elf.h,
- [AC_DEFINE(SVR4, 1, [System V Release 4]); LIBS="$LIBS -lelf"])
+AC_CHECK_HEADER([elf.h],
+ [AC_DEFINE([SVR4], [1], [System V Release 4]); LIBS="$LIBS -lelf"])
@end example
@node Setting Output Variables
@@ -7489,7 +7489,7 @@
[ac_cv_shell_true_works=no
true && ac_cv_shell_true_works=yes
if test $ac_cv_shell_true_works = yes; then
- AC_DEFINE([TRUE_WORKS], 1
+ AC_DEFINE([TRUE_WORKS], [1],
[Define if `true(1)' works properly.])
fi])
])
@@ -7508,7 +7508,7 @@
[ac_cv_shell_true_works=no
true && ac_cv_shell_true_works=yes])
if test $ac_cv_shell_true_works = yes; then
- AC_DEFINE([TRUE_WORKS], 1
+ AC_DEFINE([TRUE_WORKS], [1],
[Define if `true(1)' works properly.])
fi
])
@@ -7648,8 +7648,8 @@
@group
# Checks for libraries.
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(socket, connect)
+AC_CHECK_LIB([nsl], [gethostbyname])
+AC_CHECK_LIB([socket], [connect])
@r{ @dots{} more lib checks @dots{}}
AC_CACHE_SAVE
@end group
@@ -9041,7 +9041,7 @@
# AC_MSG_ERROR(ERROR, [EXIT-STATUS = 1])
# --------------------------------------
m4_define([AC_MSG_ERROR],
[EMAIL PROTECTED] _AC_ECHO([configure: error: $1], 2); exit m4_default([$2],
1); @}])
[EMAIL PROTECTED] _AC_ECHO([configure: error: $1], [2]); exit m4_default([$2],
[1]); @}])
@end example
Comments about the macro should be left in the header comment. Most
@@ -13189,7 +13190,7 @@
i?86-*-*) CYCLE_OBJ=rdtsc.o ;;
*) CYCLE_OBJ= ;;
esac
-AC_SUBST(CYCLE_OBJ)
+AC_SUBST([CYCLE_OBJ])
@end example
@code{AC_CONFIG_LINKS} (@pxref{Configuration Links}) is another good way
@@ -13199,9 +13200,9 @@
@example
case $host in
- alpha*-*-*) AC_CONFIG_LINKS(dither.c:alpha/dither.c) ;;
- powerpc*-*-*) AC_CONFIG_LINKS(dither.c:powerpc/dither.c) ;;
- *-*-*) AC_CONFIG_LINKS(dither.c:generic/dither.c) ;;
+ alpha*-*-*) AC_CONFIG_LINKS([dither.c:alpha/dither.c]) ;;
+ powerpc*-*-*) AC_CONFIG_LINKS([dither.c:powerpc/dither.c]) ;;
+ *-*-*) AC_CONFIG_LINKS([dither.c:generic/dither.c]) ;;
esac
@end example
@@ -13515,8 +13522,8 @@
Options}). The following example will make this clearer.
@example
-AC_ARG_WITH(foo,
- [AS_HELP_STRING(--with-foo,
+AC_ARG_WITH([foo],
+ [AS_HELP_STRING([--with-foo],
[use foo (default is no)])],
[ac_cv_use_foo=$withval],
[ac_cv_use_foo=no])
@@ -14507,8 +14514,8 @@
is:
@example
-AC_CONFIG_LINKS(host.h:config/$machine.h
- object.h:config/$obj_format.h)
+AC_CONFIG_LINKS([host.h:config/$machine.h
+ object.h:config/$obj_format.h])
@end example
@end defmac
@@ -15105,11 +15112,11 @@
Here is a way to write it for version 2:
@example
-AC_CHECK_FUNCS(syslog)
+AC_CHECK_FUNCS([syslog])
if test $ac_cv_func_syslog = no; then
# syslog is not in the default libraries. See if it's in some other.
for lib in bsd socket inet; do
- AC_CHECK_LIB($lib, syslog, [AC_DEFINE(HAVE_SYSLOG)
+ AC_CHECK_LIB([$lib], [syslog], [AC_DEFINE([HAVE_SYSLOG])
LIBS="$LIBS -l$lib"; break])
done
fi
@@ -15475,7 +15482,7 @@
# the ANSI2KNR-filtering rules.
LIBOBJS=`echo "$LIBOBJS" | sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/\.lo/g'`
-AC_SUBST(LTLIBOBJS)
+AC_SUBST([LTLIBOBJS])
@end example
@noindent
@@ -15493,7 +15500,7 @@
sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
LTLIBOBJS=`echo "$LIB@@&t@@OBJS" |
sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
-AC_SUBST(LTLIBOBJS)
+AC_SUBST([LTLIBOBJS])
@end example
@sp 1
@@ -16464,7 +16471,7 @@
const number pi = 3;
$ @kbd{cat configure.ac}
AC_INIT
-AC_CHECK_HEADERS(pi.h)
+AC_CHECK_HEADERS([pi.h])
$ @kbd{autoconf -Wall}
$ @kbd{./configure}
checking for gcc... gcc
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.897
diff -u -r1.897 autoconf.texi
--- doc/autoconf.texi 10 May 2005 23:37:37 -0000 1.897
+++ doc/autoconf.texi 15 May 2005 03:20:30 -0000
@@ -5318,7 +5318,7 @@
(@pxref{Default Includes}).
@example
-AC_CHECK_MEMBER(struct passwd.pw_gecos,,
+AC_CHECK_MEMBER([struct passwd.pw_gecos], [],
[AC_MSG_ERROR([We need `passwd.pw_gecos'!])],
[#include <pwd.h>])
@end example
@@ -7656,8 +7656,8 @@
@group
# Might [EMAIL PROTECTED]
-AM_PATH_GTK(1.0.2,, [AC_MSG_ERROR([GTK not in path])])
-AM_PATH_GTKMM(0.9.5,, [AC_MSG_ERROR([GTK not in path])])
+AM_PATH_GTK([1.0.2], [], [AC_MSG_ERROR([GTK not in path])])
+AM_PATH_GTKMM([0.9.5], [], [AC_MSG_ERROR([GTK not in path])])
@end group
@r{ @dots{} AC_OUTPUT, etc. @dots{}}
@end example
@@ -14182,7 +14189,7 @@
This macro is equivalent to:
@example
-AC_CHECK_TYPE([EMAIL PROTECTED],,
+AC_CHECK_TYPE([EMAIL PROTECTED], [],
[AC_DEFINE_UNQUOTED([EMAIL PROTECTED], [EMAIL PROTECTED],
[Define to [EMAIL PROTECTED]' if
<sys/types.h> does not define.])])
@@ -14275,7 +14282,7 @@
Same as:
@example
-AC_CHECK_DECLS([sys_siglist],,,
+AC_CHECK_DECLS([sys_siglist], [], [],
[#include <signal.h>
/* NetBSD declares sys_siglist in unistd.h. */
#if HAVE_UNISTD_H
@@ -16506,7 +16513,7 @@
@example
$ @kbd{cat configure.ac}
AC_INIT
-AC_CHECK_HEADERS(number.h pi.h,,,
+AC_CHECK_HEADERS([number.h pi.h], [], [],
[[#if HAVE_NUMBER_H
# include <number.h>
#endif
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.897
diff -u -r1.897 autoconf.texi
--- doc/autoconf.texi 10 May 2005 23:37:37 -0000 1.897
+++ doc/autoconf.texi 15 May 2005 03:25:37 -0000
@@ -5389,19 +5389,19 @@
@defmac AC_TYPE_MODE_T
@acindex{TYPE_MODE_T}
@cvindex mode_t
-Equivalent to @samp{AC_CHECK_TYPE(mode_t, int)}.
+Equivalent to @samp{AC_CHECK_TYPE([mode_t], [int])}.
@end defmac
@defmac AC_TYPE_OFF_T
@acindex{TYPE_OFF_T}
@cvindex off_t
-Equivalent to @samp{AC_CHECK_TYPE(off_t, long int)}.
+Equivalent to @samp{AC_CHECK_TYPE([off_t], [long int])}.
@end defmac
@defmac AC_TYPE_PID_T
@acindex{TYPE_PID_T}
@cvindex pid_t
-Equivalent to @samp{AC_CHECK_TYPE(pid_t, int)}.
+Equivalent to @samp{AC_CHECK_TYPE([pid_t], [int])}.
@end defmac
@defmac AC_TYPE_SIGNAL
@@ -5428,7 +5428,7 @@
@defmac AC_TYPE_SIZE_T
@acindex{TYPE_SIZE_T}
@cvindex size_t
-Equivalent to @samp{AC_CHECK_TYPE(size_t, unsigned int)}.
+Equivalent to @samp{AC_CHECK_TYPE([size_t], [unsigned int])}.
@end defmac
@defmac AC_TYPE_UID_T
@@ -14315,7 +14322,7 @@
@code{LIBS}. This macro used to be defined as
@example
-AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS")
+AC_CHECK_LIB([seq], [getmntent], [LIBS="-lseq $LIBS"])
@end example
@noindent
@@ -14453,7 +14460,7 @@
getpwnam)}. Up to Autoconf 2.13, it used to be
@example
-AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS")
+AC_CHECK_LIB([sun], [getmntent], [LIBS="-lsun $LIBS"])
@end example
@noindent
@@ -14461,23 +14468,23 @@
@example
AC_FUNC_GETMNTENT
-AC_CHECK_LIB(sun, getpwnam)
+AC_CHECK_LIB([sun], [getpwnam])
@end example
@end defmac
@defmac AC_LANG_C
@acindex{LANG_C}
-Same as @samp{AC_LANG(C)}.
+Same as @samp{AC_LANG([C])}.
@end defmac
@defmac AC_LANG_CPLUSPLUS
@acindex{LANG_CPLUSPLUS}
-Same as @samp{AC_LANG(C++)}.
+Same as @samp{AC_LANG([C++])}.
@end defmac
@defmac AC_LANG_FORTRAN77
@acindex{LANG_FORTRAN77}
-Same as @samp{AC_LANG(Fortran 77)}.
+Same as @samp{AC_LANG([Fortran 77])}.
@end defmac
@defmac AC_LANG_RESTORE
@@ -14544,7 +14551,7 @@
@cvindex NEED_MEMORY_H
Used to define @code{NEED_MEMORY_H} if the @code{mem} functions were
defined in @file{memory.h}. Today it is equivalent to
[EMAIL PROTECTED](memory.h)}. Adjust your code to depend upon
[EMAIL PROTECTED]([memory.h])}. Adjust your code to depend upon
@code{HAVE_MEMORY_H}, not @code{NEED_MEMORY_H}; see @ref{Standard
Symbols}.
@end defmac
@@ -14721,7 +14728,7 @@
macro used to do this:
@example
-AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS")
+AC_CHECK_LIB([intl], [strftime], [LIBS="-lintl $LIBS"])
@end example
@noindent
@@ -14891,7 +14898,7 @@
@defmac AC_UNISTD_H
@acindex{UNISTD_H}
-Same as @samp{AC_CHECK_HEADERS(unistd.h)}.
+Same as @samp{AC_CHECK_HEADERS([unistd.h])}.
@end defmac
@defmac AC_USG
@@ -14955,7 +14962,7 @@
@example
AC_MSG_CHECKING([for Xenix])
-AC_EGREP_CPP(yes,
+AC_EGREP_CPP([yes],
[#if defined M_XENIX && !defined M_UNIX
yes
#endif],
* doc/autoconf.texi: Add some syntax highlighting helper comments.
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.897
diff -u -r1.897 autoconf.texi
--- doc/autoconf.texi 10 May 2005 23:37:37 -0000 1.897
+++ doc/autoconf.texi 15 May 2005 03:18:09 -0000
@@ -8554,6 +8554,7 @@
@table @samp
@item $$
[EMAIL PROTECTED] syntax highlighting help: $$
The character @samp{$}.
@item $f
@@ -11961,6 +11963,7 @@
test -n "$tmp" && test -d "$tmp"
@} || @{
tmp=$TMPDIR/foo$$-$RANDOM
[EMAIL PROTECTED] syntax highlighting help: $$
(umask 077 && mkdir "$tmp")
@} || exit $?
@end example
@@ -12617,6 +12620,7 @@
for i in $(HEADERS); do \
$(INSTALL) -m 644 `test -f $$i || echo ../pkg/src/`$$i \
$(DESTDIR)$(includedir)/$$i; \
[EMAIL PROTECTED] syntax highlighting help: $$
done
@end example
@@ -12677,6 +12681,7 @@
i=`expr "$$i" : '../pkg/src/\(.*\)'`;
$(INSTALL) -m 644 `test -f $$i || echo ../pkg/src/`$$i \
$(DESTDIR)$(includedir)/$$i; \
[EMAIL PROTECTED] syntax highlighting help: $$
done
@end example
* doc/autoconf.texi (all over the map): Reword a few sentences
to fix many underflow and overflow warnings during `make dvi'.
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.897
diff -u -r1.897 autoconf.texi
--- doc/autoconf.texi 10 May 2005 23:37:37 -0000 1.897
+++ doc/autoconf.texi 15 May 2005 03:10:14 -0000
@@ -656,25 +656,25 @@
Mail suggestions to @email{autoconf@@gnu.org, the Autoconf mailing
list}.
-Bug reports should be emailed to @email{bug-autoconf@@gnu.org, the
+Bug reports should be sent to @email{bug-autoconf@@gnu.org, the
Autoconf Bugs mailing list}. If possible, first check that your bug is
not already solved in current development versions, and that it has not
been reported yet. Be sure to include all the needed information and a
short @file{configure.ac} that demonstrates the problem.
-Autoconf's development tree is accessible via @acronym{CVS}; see the
[EMAIL PROTECTED]://savannah.gnu.org/projects/autoconf/, Autoconf
+Autoconf's development tree is accessible via anonymous @acronym{CVS};
+see the @uref{http://savannah.gnu.org/projects/autoconf/, Autoconf
Summary} for details. Patches relative to the
current @acronym{CVS} version can be sent for review to the
@email{autoconf-patches@@gnu.org, Autoconf Patches mailing list}.
Archives of @email{bug-autoconf@@gnu.org} can be
-found in @uref{http://lists.gnu.org/archive/html/bug-autoconf/}, and
+found in @uref{http://lists.gnu.org/archive/@/html/bug-autoconf/}, and
similarly for the other mailing lists.
-Because of its mission, Autoconf includes only a set of often-used
-macros that have already demonstrated their usefulness. Nevertheless,
-if you wish to share your macros, or find existing ones, see the
+Because of its mission, the Autoconf package itself includes only a set of
+often-used macros that have already demonstrated their usefulness.
+Nevertheless, if you wish to share your macros, or find existing ones, see the
@uref{http://www.gnu.org/software/ac-archive/, @acronym{GNU} Autoconf Macro
Archive}, which is kindly run by @email{simons@@cryp.to,
Peter Simons}.
@@ -792,7 +792,7 @@
The home pages for
@uref{http://www.gnu.org/software/autoconf/, Autoconf},
@uref{http://www.gnu.org/software/automake/, Automake}, and
[EMAIL PROTECTED]://www.gnu.org/software/libtool/, Libtool}.
[EMAIL PROTECTED]://@/www.gnu.org/@/software/libtool/, Libtool}.
@item Automake Manual
@@ -806,7 +806,7 @@
by G. V. Vaughan, B. Elliston, T. Tromey, and I. L. Taylor. SAMS (originally
New Riders), 2000, ISBN 1578701902.} describes the complete @acronym{GNU}
build environment. You can also find
[EMAIL PROTECTED]://sources.redhat.com/autobook/, the entire book on-line}.
[EMAIL PROTECTED]://@/sources.redhat.com/autobook/, the entire book on-line}.
@end itemize
@@ -1342,8 +1342,8 @@
@end table
Warnings about @samp{syntax} are enabled by default, and the environment
-variable @env{WARNINGS}, a comma separated list of categories, is
-honored. Passing @samp{-W @var{category}} will actually behave as if
+variable @env{WARNINGS}, a comma separated list of categories, is honored
+as well. Passing @samp{-W @var{category}} will actually behave as if
you had passed @samp{--warnings=syntax,$WARNINGS,@var{category}}. If
you want to disable the defaults and @env{WARNINGS}, but (for example)
enable the warnings about obsolete constructs, you would use @option{-W
@@ -1509,8 +1509,8 @@
Install the missing auxiliary files in the package. By default, files
are copied; this can be changed with @option{--symlink}.
-This option triggers calls to @samp{automake --add-missing},
[EMAIL PROTECTED], @samp{autopoint}, etc.
+If deemed appropriate, this option triggers calls to
[EMAIL PROTECTED] --add-missing}, @samp{libtoolize}, @samp{autopoint}, etc.
@item --symlink
@itemx -s
@@ -1564,8 +1564,8 @@
@end table
Warnings about @samp{syntax} are enabled by default, and the environment
-variable @env{WARNINGS}, a comma separated list of categories, is
-honored. Passing @samp{-W @var{category}} will actually behave as if
+variable @env{WARNINGS}, a comma separated list of categories, is honored
+as well. Passing @samp{-W @var{category}} will actually behave as if
you had passed @samp{--warnings=syntax,$WARNINGS,@var{category}}. If
you want to disable the defaults and @env{WARNINGS}, but (for example)
enable the warnings about obsolete constructs, you would use @option{-W
@@ -2618,10 +2618,15 @@
(Be careful if you copy these lines directly into your Makefile, as you
will need to convert the indented lines to start with the tab character.)
-In addition, you should use @samp{AC_CONFIG_FILES([stamp-h], [echo
-timestamp > stamp-h])} so @file{config.status} will ensure that
[EMAIL PROTECTED] is considered up to date. @xref{Output}, for more
-information about @code{AC_OUTPUT}.
+In addition, you should use
+
[EMAIL PROTECTED]
+AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED]
+so @file{config.status} will ensure 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
configuration-related dependencies.
@@ -4167,7 +4172,7 @@
If the system has the @code{getloadavg} function, define
@code{HAVE_GETLOADAVG}, and set @code{GETLOADAVG_LIBS} to any libraries
-needed to get that function. Also add @code{GETLOADAVG_LIBS} to
+necessary to get that function. Also add @code{GETLOADAVG_LIBS} to
@code{LIBS}. Otherwise, require an @code{AC_LIBOBJ} replacement for
@samp{getloadavg} with source code in @[EMAIL PROTECTED]/getloadavg.c}, and
possibly define several other C preprocessor macros and output
@@ -4536,8 +4541,8 @@
@defmac AC_CHECK_FUNCS (@[EMAIL PROTECTED], @ovar{action-if-found},
@ovar{action-if-not-found})
@acindex{CHECK_FUNCS}
@cvindex [EMAIL PROTECTED]
-For each @var{function} in the blank-or-newline-separated argument list,
-define @[EMAIL PROTECTED] (in all capitals) if it is available.
+For each @var{function} enumerated in the blank-or-newline-separated argument
+list, define @[EMAIL PROTECTED] (in all capitals) if it is available.
If @var{action-if-found} is given, it is additional shell code to
execute when one of the functions is found. You can give it a value of
@samp{break} to break out of the loop on the first match. If
@@ -5620,8 +5625,10 @@
yields
@example
[EMAIL PROTECTED]: "foo.c", line 13: error 4048: Non-terminating comment at end
of file.
[EMAIL PROTECTED]: "foo.c", line 13: error 4033: Missing #endif at end of file.
[EMAIL PROTECTED]: "foo.c", line 13: error 4048: \
+Non-terminating comment at end of file.
[EMAIL PROTECTED]: "foo.c", line 13: error 4033: \
+Missing #endif at end of file.
@end example
@noindent
@@ -6416,7 +6423,7 @@
@cindex Large file support
@cindex LFS
Arrange for
[EMAIL PROTECTED]://www.unix-systems.org/version2/whatsnew/lfs20mar.html,
[EMAIL PROTECTED]://www.unix-systems.org/version2/@/whatsnew/@/lfs20mar.html,
large-file support}. On some hosts, one must use special compiler
options to build programs that can access large files. Append any such
options to the output variable @code{CC}. Define
@@ -7124,8 +7131,8 @@
@item Tru64
@cindex Tru64
-The @uref{http://h30097.www3.hp.com/docs/,
-documentation of several versions of Tru64} is available in different
[EMAIL PROTECTED]://h30097.www3.hp.com/@/docs/,
+Documentation of several versions of Tru64} is available in different
formats.
@item Unix version 7
@@ -7581,7 +7588,7 @@
are invalid for some reason, the user may delete or edit it.
By default, @command{configure} uses no cache file (technically, it uses
[EMAIL PROTECTED]/dev/null}), to avoid problems caused by accidental
[EMAIL PROTECTED]/dev/@/null}), to avoid problems caused by accidental
use of stale cache files.
To enable caching, @command{configure} accepts @option{--config-cache} (or
@@ -8407,9 +8414,9 @@
@end example
@noindent
-If you want to disable @command{autom4te}'s defaults and
[EMAIL PROTECTED], but (for example) enable the warnings about obsolete
-constructs, you would use @option{-W none,obsolete}.
+For example, if you want to disable @command{autom4te}'s defaults and
[EMAIL PROTECTED], but enable the warnings about obsolete constructs,
+you would use @option{-W none,obsolete}.
@cindex Back trace
@cindex Macro invocation stack
@@ -8433,11 +8440,11 @@
@example
$ @kbd{autom4te -l autoconf -Wcross}
-configure.ac:8: warning: AC_RUN_IFELSE called without default \
-to allow cross compiling
+configure.ac:8: warning: AC_RUN_IFELSE called without \
+default to allow cross compiling
$ @kbd{autom4te -l autoconf -Wcross,error -f}
-configure.ac:8: error: AC_RUN_IFELSE called without default \
-to allow cross compiling
+configure.ac:8: error: AC_RUN_IFELSE called without \
+default to allow cross compiling
acgeneral.m4:3044: AC_RUN_IFELSE is expanded from...
configure.ac:2: INNER is expanded from...
configure.ac:5: OUTER is expanded from...
@@ -8648,10 +8656,10 @@
@cindex @file{autom4te.cfg}
As an example, if Autoconf is installed in its default location,
[EMAIL PROTECTED]/usr/local}, running @samp{autom4te -l m4sugar foo.m4} is
-strictly equivalent to running @samp{autom4te --prepend-include
[EMAIL PROTECTED]/usr/local}, the command @samp{autom4te -l m4sugar foo.m4} is
+strictly equivalent to the command @samp{autom4te --prepend-include
/usr/local/share/autoconf m4sugar/m4sugar.m4f --warnings syntax foo.m4}.
-Recursive expansion applies: running @samp{autom4te -l m4sh foo.m4}
+Recursive expansion applies here: the command @samp{autom4te -l m4sh foo.m4}
is the same as @samp{autom4te --language M4sugar m4sugar/m4sh.m4f
foo.m4}, i.e., @samp{autom4te --prepend-include /usr/local/share/autoconf
m4sugar/m4sugar.m4f m4sugar/m4sh.m4f --mode 777 foo.m4}. The definition
@@ -9655,7 +9663,7 @@
There are several families of shells, most prominently the Bourne family
and the C shell family which are deeply incompatible. If you want to
write portable shell scripts, avoid members of the C shell family. The
[EMAIL PROTECTED]://www.faqs.org/faqs/unix-faq/shell/shell-differences/, the
[EMAIL PROTECTED]://www.faqs.org/@/faqs/unix-faq/shell/shell-differences/, the
Shell difference FAQ} includes a small history of Posix shells, and a
comparison between several of them.
@@ -9731,10 +9739,10 @@
@prindex @command{/usr/bin/ksh} on Solaris
@command{/usr/bin/ksh} is @samp{ksh88},
@prindex @command{/usr/xpg4/bin/sh} on Solaris
[EMAIL PROTECTED]/usr/xpg4/bin/sh} is a Posix-compliant variant of
[EMAIL PROTECTED]/usr/xpg4/@/bin/sh} is a Posix-compliant variant of
@samp{ksh88}, and
@prindex @command{/usr/dt/bin/dtksh} on Solaris
[EMAIL PROTECTED]/usr/dt/bin/dtksh} is @samp{ksh93}. @command{/usr/bin/ksh}
[EMAIL PROTECTED]/usr/dt/@/bin/dtksh} is @samp{ksh93}. @command{/usr/bin/ksh}
is standard on Solaris; the other variants are parts of optional
packages. There is no extra charge for these packages, but they are
not part of a minimal OS install and therefore some installations may
@@ -10829,7 +10829,8 @@
such code, e.g.:
@example
-cmp file1 file2 >/dev/null 2>&1 || echo files differ or trouble
+cmp file1 file2 >/dev/null 2>&1 ||
+ echo files differ or trouble
@end example
More generally, one can always rewrite @samp{! @var{command}} as:
@@ -11987,7 +11997,8 @@
@example
$ @kbd{touch /tmp/foo}
$ @kbd{mv /tmp/foo .}
[EMAIL PROTECTED]: ./foo: set owner/group (was: 3830/0): Operation not permitted
[EMAIL PROTECTED]: ./foo: set owner/group (was: 3830/0): \
+Operation not permitted
$ @kbd{echo $?}
0
$ @kbd{ls foo}
@@ -12367,7 +12378,7 @@
[EMAIL PROTECTED] as expected.
This syntax (@code{foo=bar make -e}) is portable only when used
-outside a @file{Makefile}, for instance from a script or from the
+outside of a @file{Makefile}, for instance from a script or from the
command line. When run inside a @command{make} rule, GNU
@command{make} 3.80 and prior versions forget to propagate the
@code{-e} option to [EMAIL PROTECTED]
@@ -13347,20 +13348,22 @@
@c FIXME: Remove AS_IF when the problem of AC_REQUIRE within `if' is solved.
@example
-AC_ARG_WITH(readline,
- [AS_HELP_STRING(--with-readline,
+AC_ARG_WITH([readline],
+ [AS_HELP_STRING([--with-readline],
[support fancy command line editing @@<:@@default=check@@:>@@])],
[],
- with_readline=check)
+ [with_readline=check])
LIBREADLINE=
AS_IF([test "x$with_readline" != xno],
- [AC_CHECK_LIB(readline, main,
- [AC_SUBST(LIBREADLINE, "-lreadline -lncurses")
- AC_DEFINE(HAVE_LIBREADLINE, 1, [Define if you have libreadline])
+ [AC_CHECK_LIB([readline], [main],
+ [AC_SUBST([LIBREADLINE], ["-lreadline -lncurses"])
+ AC_DEFINE([HAVE_LIBREADLINE], [1],
+ [Define if you have libreadline])
],
[if test "x$with_readline" != xcheck; then
- AC_MSG_FAILURE([--with-readline was given, but test for readline
failed])
+ AC_MSG_FAILURE(
+ [--with-readline was given, but test for readline failed])
fi
], -lncurses)])
@end example
@@ -13371,20 +13374,22 @@
@c FIXME: Remove AS_IF when the problem of AC_REQUIRE within `if' is solved.
@example
-AC_ARG_WITH(readline,
- [AS_HELP_STRING(--with-readline,
+AC_ARG_WITH([readline],
+ [AS_HELP_STRING([--with-readline],
[enable experimental support for readline])],
[],
- with_readline=no)
+ [with_readline=no])
LIBREADLINE=
AS_IF([test "x$with_readline" != xno],
- [AC_CHECK_LIB(readline, main,
- [AC_SUBST(LIBREADLINE, "-lreadline -lncurses")
- AC_DEFINE(HAVE_LIBREADLINE, 1, [Define if you have libreadline])
+ [AC_CHECK_LIB([readline], [main],
+ [AC_SUBST([LIBREADLINE], ["-lreadline -lncurses"])
+ AC_DEFINE([HAVE_LIBREADLINE], [1],
+ [Define if you have libreadline])
],
- [AC_MSG_FAILURE([--with-readline was given, but test for readline
failed])],
- -lncurses)])
+ [AC_MSG_FAILURE(
+ [--with-readline was given, but test for readline failed])],
+ [-lncurses])])
@end example
The last example shows how to use @code{AC_ARG_WITH} to give the user the
@@ -13393,20 +13398,22 @@
@c FIXME: Remove AS_IF when the problem of AC_REQUIRE within `if' is solved.
@example
-AC_ARG_WITH(readline,
- [AS_HELP_STRING(--without-readline,
+AC_ARG_WITH([readline],
+ [AS_HELP_STRING([--without-readline],
[disable support for readline])],
[],
- with_readline=yes)
+ [with_readline=yes])
LIBREADLINE=
AS_IF([test "x$with_readline" != xno],
- [AC_CHECK_LIB(readline, main,
- [AC_SUBST(LIBREADLINE, "-lreadline -lncurses")
- AC_DEFINE(HAVE_LIBREADLINE, 1, [Define if you have libreadline])
+ [AC_CHECK_LIB([readline], [main],
+ [AC_SUBST([LIBREADLINE], ["-lreadline -lncurses"])
+ AC_DEFINE([HAVE_LIBREADLINE], [1],
+ [Define if you have libreadline])
],
- [AC_MSG_FAILURE([test for readline failed, use --without-readline if you
want to force readline support off])],
- -lncurses)])
+ [AC_MSG_FAILURE(
+[readline test failed (--without-readline forces disabling)])],
+ [-lncurses])])
@end example
These three examples can be easily adapted to the case where
@@ -16096,7 +16115,8 @@
$(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS)
installcheck-local: atconfig atlocal $(TESTSUITE)
- $(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
+ $(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" \
+ $(TESTSUITEFLAGS)
AUTOTEST = $(AUTOM4TE) --language=autotest
$(TESTSUITE): $(srcdir)/testsuite.at
@@ -16331,8 +16351,8 @@
@example
AC_DEFINE_UNQUOTED([DATADIR], [$datadir],
- [Define to the read-only architecture-independent
- data directory.])
+ [Define to the read-only
+ architecture-independent data directory.])
@end example
@noindent
@@ -16374,7 +16394,7 @@
Use @code{AC_DEFINE} but have @command{configure} compute the literal
value of @code{datadir} and others. Many people have wrapped macros to
automate this task. For instance, the macro @code{AC_DEFINE_DIR} from
-the @uref{http://www.gnu.org/software/ac-archive/, @acronym{GNU} Autoconf Macro
+the @uref{http://www.gnu.org/@/software/ac-archive/, @acronym{GNU} Autoconf
Macro
Archive}.
This solution does not conform to the @acronym{GNU} Coding Standards.
Index: doc/install.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/install.texi,v
retrieving revision 1.42
diff -u -r1.42 install.texi
--- doc/install.texi 1 Feb 2005 00:32:44 -0000 1.42
+++ doc/install.texi 15 May 2005 03:10:14 -0000
@@ -121,13 +121,13 @@
@section Installation Names
By default, @samp{make install} will install the package's files in
[EMAIL PROTECTED]/usr/local/bin}, @file{/usr/local/man}, etc. You can specify
an
[EMAIL PROTECTED]/usr/local/bin}, @file{/usr/@/local/@/man}, etc. You can
specify an
installation prefix other than @file{/usr/local} by giving
@command{configure} the option @[EMAIL PROTECTED]
You can specify separate installation prefixes for architecture-specific
-files and architecture-independent files. If you give
[EMAIL PROTECTED] the option @[EMAIL PROTECTED], the
+files and architecture-independent files. If you pass the option
[EMAIL PROTECTED]@var{prefix}} to @command{configure}, the
package will use @var{prefix} as the prefix for installing programs and
libraries. Documentation and other data files will still use the
regular prefix.
@@ -187,7 +187,7 @@
doesn't need to know the machine type.
If you are @emph{building} compiler tools for cross-compiling, you
-should use the @[EMAIL PROTECTED] option to select the type of
+should use the option @[EMAIL PROTECTED] to select the type of
system they will produce code for.
If you want to @emph{use} a cross compiler, that generates code for a
