mirror of
git://git.sv.gnu.org/autoconf
synced 2025-01-30 11:01:45 +08:00
Avoid some autoreconf -Wall warnings.
* configure.ac: Use proper quoting, to be a good example. (PACKAGE_NAME): Remove setting covered by autoconf. (AM_INIT_AUTOMAKE): Bump automake requirement, for html rules. * doc/Makefile.am (TEXI2DVI): Remove settings covered by automake. (html, autoconf_1.html, standards_1.html): Likewise. (TEXI2HTML, TEXI2HTML_FLAGS): Remove unused macros. * Makefile.am (html): Likewise. * doc/autoconf.texi (Quoting and Parameters): Add missing section name. * tests/Makefile.am (AUTOMAKE_OPTIONS): Intentionally ignore warning about our override, until Automake is fixed. * README-hacking: Document minimum requirements for bootstrap. Signed-off-by: Eric Blake <ebb9@byu.net>
This commit is contained in:
Eric Blake
parent
1fda5799d3
commit
eb06dd76c9
17
ChangeLog
17
ChangeLog
@ -1,3 +1,20 @@
|
||||
2008-04-05 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Avoid some autoreconf -Wall warnings.
|
||||
* configure.ac: Use proper quoting, to be a good example.
|
||||
(PACKAGE_NAME): Remove setting covered by autoconf.
|
||||
(AM_INIT_AUTOMAKE): Bump automake requirement, for html rules.
|
||||
* doc/Makefile.am (TEXI2DVI): Remove settings covered by
|
||||
automake.
|
||||
(html, autoconf_1.html, standards_1.html): Likewise.
|
||||
(TEXI2HTML, TEXI2HTML_FLAGS): Remove unused macros.
|
||||
* Makefile.am (html): Likewise.
|
||||
* doc/autoconf.texi (Quoting and Parameters): Add missing section
|
||||
name.
|
||||
* tests/Makefile.am (AUTOMAKE_OPTIONS): Intentionally ignore
|
||||
warning about our override, until Automake is fixed.
|
||||
* README-hacking: Document minimum requirements for bootstrap.
|
||||
|
||||
2008-04-03 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Fix version number generation in man pages.
|
||||
|
||||
10
Makefile.am
10
Makefile.am
@ -31,16 +31,6 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
|
||||
|
||||
MAINTAINERCLEANFILES = $(srcdir)/INSTALL
|
||||
|
||||
## -------------------- ##
|
||||
## Forwarding targets. ##
|
||||
## -------------------- ##
|
||||
|
||||
html:
|
||||
cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
|
||||
|
||||
.PHONY: html
|
||||
|
||||
|
||||
## --------- ##
|
||||
## INSTALL. ##
|
||||
## --------- ##
|
||||
|
||||
@ -11,12 +11,12 @@ requirements on anyone wishing to build from the just-checked-out sources.
|
||||
For example, you have to use the latest stable versions of the maintainer
|
||||
tools we depend upon, including:
|
||||
|
||||
- Autoconf <http://www.gnu.org/software/autoconf/>
|
||||
- Automake <http://www.gnu.org/software/automake/>
|
||||
- Help2man <http://www.gnu.org/software/help2man/>
|
||||
- M4 <http://www.gnu.org/software/m4/>
|
||||
- Perl <http://www.cpan.org/>
|
||||
- Texinfo <http://www.gnu.org/software/texinfo/>
|
||||
- Autoconf 2.60+ <http://www.gnu.org/software/autoconf/>
|
||||
- Automake 1.10+ <http://www.gnu.org/software/automake/>
|
||||
- Help2man 1.29+ <http://www.gnu.org/software/help2man/>
|
||||
- M4 1.4.5+ <http://www.gnu.org/software/m4/>
|
||||
- Perl 5.005_03+ <http://www.cpan.org/>
|
||||
- Texinfo 4.8+ <http://www.gnu.org/software/texinfo/>
|
||||
|
||||
The following are useful as well, if you want to be able to run commands
|
||||
like "make dist" or "make distcheck":
|
||||
|
||||
13
configure.ac
13
configure.ac
@ -23,12 +23,11 @@ AC_PREREQ([2.60])
|
||||
AC_INIT([GNU Autoconf],
|
||||
m4_esyscmd([build-aux/git-version-gen .tarball-version]),
|
||||
[bug-autoconf@gnu.org])
|
||||
AC_SUBST([PACKAGE_NAME])dnl
|
||||
AC_CONFIG_SRCDIR([ChangeLog])
|
||||
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
|
||||
AM_INIT_AUTOMAKE([1.7.9 dist-bzip2 readme-alpha no-texinfo.tex])
|
||||
AM_INIT_AUTOMAKE([1.10 dist-bzip2 readme-alpha no-texinfo.tex])
|
||||
|
||||
# We use `/bin/sh -n script' to check that there are no syntax errors
|
||||
# in the scripts. Although incredible, there are /bin/sh that go into
|
||||
@ -53,7 +52,7 @@ AM_INIT_AUTOMAKE([1.7.9 dist-bzip2 readme-alpha no-texinfo.tex])
|
||||
# So before using `/bin/sh -n' to check our scripts, we first check
|
||||
# that `/bin/sh -n' is known to not have these problems.
|
||||
|
||||
AC_CACHE_CHECK([whether /bin/sh -n is known to work], ac_cv_sh_n_works,
|
||||
AC_CACHE_CHECK([whether /bin/sh -n is known to work], [ac_cv_sh_n_works],
|
||||
[if (
|
||||
unset BASH_VERSION ZSH_VERSION
|
||||
/bin/sh -c '
|
||||
@ -67,7 +66,7 @@ then ac_cv_sh_n_works=yes
|
||||
else ac_cv_sh_n_works=no
|
||||
fi
|
||||
])
|
||||
AC_SUBST(ac_cv_sh_n_works)
|
||||
AC_SUBST([ac_cv_sh_n_works])
|
||||
|
||||
# Initialize the test suite.
|
||||
AC_CONFIG_TESTDIR([tests])
|
||||
@ -89,8 +88,8 @@ AC_PROG_GNU_M4
|
||||
## Man pages. ##
|
||||
## ----------- ##
|
||||
|
||||
AC_CONFIG_FILES(man/Makefile)
|
||||
AM_MISSING_PROG(HELP2MAN, help2man)
|
||||
AC_CONFIG_FILES([man/Makefile])
|
||||
AM_MISSING_PROG([HELP2MAN], [help2man])
|
||||
|
||||
|
||||
## ------ ##
|
||||
@ -98,7 +97,7 @@ AM_MISSING_PROG(HELP2MAN, help2man)
|
||||
## ------ ##
|
||||
|
||||
# We use an absolute name for perl so the #! line in autoscan will work.
|
||||
AC_PATH_PROG([PERL], perl, no)
|
||||
AC_PATH_PROG([PERL], [perl], [no])
|
||||
AC_SUBST([PERL])dnl
|
||||
if test "$PERL" = no; then
|
||||
AC_MSG_ERROR([perl is not found])
|
||||
|
||||
27
doc/.gitignore
vendored
27
doc/.gitignore
vendored
@ -2,35 +2,36 @@
|
||||
*.ACs
|
||||
*.AT
|
||||
*.ATs
|
||||
*.aux
|
||||
*.cp
|
||||
*.cps
|
||||
*.cv
|
||||
*.cvs
|
||||
*.dvi
|
||||
*.ev
|
||||
*.evs
|
||||
*.fn
|
||||
*.fns
|
||||
*.html
|
||||
*.htp
|
||||
*.info
|
||||
*.ky
|
||||
*.log
|
||||
*.MS
|
||||
*.MSs
|
||||
*.ov
|
||||
*.ovs
|
||||
*.pr
|
||||
*.prs
|
||||
*.vr
|
||||
*.vrs
|
||||
*.ky
|
||||
*.aux
|
||||
*.dvi
|
||||
*.info
|
||||
*.log
|
||||
Makefile
|
||||
autoconf
|
||||
*.pdf
|
||||
*.pg
|
||||
*.pr
|
||||
*.prs
|
||||
*.ps
|
||||
stamp-vti
|
||||
standards
|
||||
*.tmp
|
||||
*.toc
|
||||
*.tp
|
||||
*.vr
|
||||
*.vrs
|
||||
Makefile
|
||||
stamp-vti
|
||||
standards
|
||||
version.texi
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
# Make Autoconf documentation.
|
||||
|
||||
# Copyright (C) 2000, 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2000, 2001, 2002, 2003, 2007, 2008 Free Software
|
||||
# Foundation, Inc.
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -16,8 +17,6 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
AM_MAKEINFOFLAGS = --no-split
|
||||
TEXI2DVI = texi2dvi --batch
|
||||
TEXI2HTML = texi2html
|
||||
TEXI2HTML_FLAGS = -split_chapter
|
||||
TEXINFO_TEX = ../build-aux/texinfo.tex
|
||||
|
||||
@ -29,21 +28,4 @@ standards_TEXINFOS = make-stds.texi
|
||||
# not know.
|
||||
CLEANFILES = autoconf.ACs autoconf.cvs autoconf.MSs autoconf.prs \
|
||||
autoconf.ATs autoconf.evs autoconf.fns autoconf.ovs \
|
||||
autoconf.tmp \
|
||||
autoconf*.html standards*.html
|
||||
|
||||
|
||||
## ----------------------------- ##
|
||||
## Other documentation formats. ##
|
||||
## ----------------------------- ##
|
||||
|
||||
html: autoconf_1.html standards_1.html
|
||||
|
||||
autoconf_1.html: autoconf.texi install.texi
|
||||
$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/autoconf.texi
|
||||
|
||||
standards_1.html: standards.texi make-stds.texi
|
||||
$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/standards.texi
|
||||
|
||||
|
||||
.PHONY: html
|
||||
autoconf.tmp
|
||||
|
||||
@ -9346,7 +9346,7 @@ car([[[a]]])
|
||||
@end example
|
||||
|
||||
@node Quoting and Parameters
|
||||
@subsection
|
||||
@subsection Quoting and Parameters
|
||||
|
||||
When M4 encounters @samp{$} within a macro definition, followed
|
||||
immediately by a character it recognizes (@samp{0}@dots{}@samp{9},
|
||||
|
||||
@ -126,7 +126,10 @@ atconfig: $(top_builddir)/config.status
|
||||
# The rule in clean-local tests for existence of $(TESTSUITE), and
|
||||
# if found, attempts to run it. But the distclean-generic rule may
|
||||
# be running in parallel, and it removes $(DISTCLEANFILES) which
|
||||
# includes $(TESTSUITE).
|
||||
# includes $(TESTSUITE). This is the Automake rule, plus our
|
||||
# dependency, and we silence the warning from 'automake -Wall'.
|
||||
# TODO - fix this if newer automake accomodates the dependency.
|
||||
AUTOMAKE_OPTIONS = -Wno-override
|
||||
distclean-generic: clean-local
|
||||
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user