mirror of
git://git.sv.gnu.org/autoconf
synced 2024-11-21 01:01:48 +08:00
The Associated Rewriters are even prouder to present...
.
|
|
/-+ / + )===( U T O U P D A T E I V
// \
=========
_//_ _\_ The ``Eiffel Tower'' Release
* autoupdate.sh: Complete rewrite. See that file for a detailed
explanation. Basically, simulate the name spaces thanks to
`autoconf --trace' and auxiliary files.
No longer use `autoupdate.m4', remove the dependencies.
Synchronize the options and `--help'.
* doc/autoconf.texi (Invoking autoupdate): Humanoupdate.
* autoupdate.m4: Delete.
* tests/Makefile.am (FILTER_MACROS): Add `AC_OUTPUT'.
Since `AC_OUTPUT' is now AU_DEFUN'd, it is extracted for testing,
while it was not before.
* tests/tools.m4 (autoupdate): Re-enable. Adjust the expected
output with the right quotation (yeah!).
Pass `-m $top_srcdir': autoupdate want the `.m4' files, not the
frozen files.
* Makefile.am (nodistpkgdataDATA): Move `acversion.m4' to
(distpkgdataDATA): here, so that all the `.m4' files are in the
source hierarchy, not split across src and build.
* acversion.m4.in: Update to today's standards.
* Makefile.am: Adjust.
This commit is contained in:
Akim Demaille
parent
6754d2ea94
commit
cecf9459b8
33
ChangeLog
33
ChangeLog
@ -1,3 +1,36 @@
|
||||
2000-05-11 Akim Demaille <akim@epita.fr>
|
||||
|
||||
The Associated Rewriters are even prouder to present...
|
||||
.
|
||||
|
|
||||
|
|
||||
/-\
|
||||
/ \
|
||||
)===( U T O U P D A T E I V
|
||||
// \\
|
||||
=========
|
||||
_//_ _\\_ The ``Eiffel Tower'' Release
|
||||
|
||||
* autoupdate.sh: Complete rewrite. See that file for a detailed
|
||||
explanation. Basically, simulate the name spaces thanks to
|
||||
`autoconf --trace' and auxiliary files.
|
||||
No longer use `autoupdate.m4', remove the dependencies.
|
||||
Synchronize the options and `--help'.
|
||||
* doc/autoconf.texi (Invoking autoupdate): Humanoupdate.
|
||||
* autoupdate.m4: Delete.
|
||||
* tests/Makefile.am (FILTER_MACROS): Add `AC_OUTPUT'.
|
||||
Since `AC_OUTPUT' is now AU_DEFUN'd, it is extracted for testing,
|
||||
while it was not before.
|
||||
* tests/tools.m4 (autoupdate): Re-enable. Adjust the expected
|
||||
output with the right quotation (yeah!).
|
||||
Pass `-m $top_srcdir': autoupdate want the `.m4' files, not the
|
||||
frozen files.
|
||||
* Makefile.am (nodistpkgdataDATA): Move `acversion.m4' to
|
||||
(distpkgdataDATA): here, so that all the `.m4' files are in the
|
||||
source hierarchy, not split across src and build.
|
||||
* acversion.m4.in: Update to today's standards.
|
||||
* Makefile.am: Adjust.
|
||||
|
||||
2000-05-11 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* libm4.m4: Be robust to multiple inclusion.
|
||||
|
||||
@ -37,9 +37,9 @@ EXTRA_SCRIPTS = autoscan
|
||||
distpkgdataDATA = \
|
||||
acfunctions acheaders acidentifiers acmakevars acprograms \
|
||||
libm4.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 \
|
||||
autoupdate.m4 aclang.m4
|
||||
aclang.m4 acversion.m4
|
||||
|
||||
nodistpkgdataDATA = autoconf.m4f autoupdate.m4f acversion.m4
|
||||
nodistpkgdataDATA = autoconf.m4f
|
||||
|
||||
pkgdata_DATA = $(distpkgdataDATA) $(nodistpkgdataDATA)
|
||||
|
||||
@ -51,7 +51,7 @@ $(distpkgdataDATA)
|
||||
|
||||
# Files that should be removed, but which Automake does not know:
|
||||
# the frozen files and the scripts.
|
||||
CLEANFILES = autoconf.m4f autoupdate.m4f \
|
||||
CLEANFILES = autoconf.m4f \
|
||||
$(bin_SCRIPTS)
|
||||
|
||||
# INSTALL is a special case. Automake seems to have a single name space
|
||||
@ -98,4 +98,3 @@ common = libm4.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 acversion.m4 \
|
||||
aclang.m4
|
||||
|
||||
autoconf.m4f: autoconf.m4 $(common)
|
||||
autoupdate.m4f: autoupdate.m4 $(common)
|
||||
|
||||
@ -79,10 +79,10 @@ EXTRA_SCRIPTS = autoscan
|
||||
# s/nodistpackageDATA/nodist_pkgdata_DATA/
|
||||
# and adapt dependencies once we use a more recent Automake
|
||||
|
||||
distpkgdataDATA = acfunctions acheaders acidentifiers acmakevars acprograms libm4.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 autoupdate.m4 aclang.m4
|
||||
distpkgdataDATA = acfunctions acheaders acidentifiers acmakevars acprograms libm4.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 aclang.m4 acversion.m4
|
||||
|
||||
|
||||
nodistpkgdataDATA = autoconf.m4f autoupdate.m4f acversion.m4
|
||||
nodistpkgdataDATA = autoconf.m4f
|
||||
|
||||
pkgdata_DATA = $(distpkgdataDATA) $(nodistpkgdataDATA)
|
||||
|
||||
@ -92,7 +92,7 @@ EXTRA_DIST = $(OLDCHANGELOGS) autoconf.sh autoheader.sh autoreconf.sh autoupdate
|
||||
|
||||
# Files that should be removed, but which Automake does not know:
|
||||
# the frozen files and the scripts.
|
||||
CLEANFILES = autoconf.m4f autoupdate.m4f $(bin_SCRIPTS)
|
||||
CLEANFILES = autoconf.m4f $(bin_SCRIPTS)
|
||||
|
||||
|
||||
# The scripts.
|
||||
@ -444,7 +444,6 @@ install-data-hook: INSTALL.txt
|
||||
esac
|
||||
|
||||
autoconf.m4f: autoconf.m4 $(common)
|
||||
autoupdate.m4f: autoupdate.m4 $(common)
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
dnl This file is part of Autoconf. -*- Autoconf -*-
|
||||
dnl Version of Autoconf.
|
||||
dnl Copyright (C) 1999 Free Software Foundation, Inc.
|
||||
# This file is part of Autoconf. -*- Autoconf -*-
|
||||
# Version of Autoconf.
|
||||
# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
|
||||
|
||||
define(AC_ACVERSION, @VERSION@)
|
||||
define([AC_ACVERSION], [@VERSION@])
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
include(libm4.m4)# -*- Autoconf -*-
|
||||
# This file is part of Autoconf.
|
||||
# Driver that loads the Autoupdate macro files.
|
||||
# Copyright (C) 1999, 2000 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
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
#
|
||||
# Written by Akim Demaille.
|
||||
#
|
||||
# Do not sinclude acsite.m4 here, because it may not be installed
|
||||
# yet when Autoconf is frozen.
|
||||
# Do not sinclude ./aclocal.m4 here, to prevent it from being frozen.
|
||||
m4_include(acversion.m4)
|
||||
m4_include(acgeneral.m4)
|
||||
m4_include(aclang.m4)
|
||||
m4_include(acspecific.m4)
|
||||
m4_include(acoldnames.m4)
|
||||
divert(0)dnl
|
||||
@ -6877,18 +6877,29 @@ standard output.
|
||||
@itemx -h
|
||||
Print a summary of the command line options and exit.
|
||||
|
||||
@item --version
|
||||
@itemx -V
|
||||
Print the version number of Autoconf and exit.
|
||||
|
||||
@item --verbose
|
||||
@itemx -v
|
||||
Report processing steps.
|
||||
|
||||
@item --debug
|
||||
@itemx -d
|
||||
Don't remove the temporary files.
|
||||
|
||||
@item --macrodir=@var{dir}
|
||||
@itemx -m @var{dir}
|
||||
@evindex AC_MACRODIR
|
||||
Look for the Autoconf macro files in directory @var{dir} instead of the
|
||||
default installation directory.
|
||||
You can also set the @code{AC_MACRODIR}
|
||||
environment variable to a directory; this option overrides the
|
||||
environment variable.
|
||||
Look for the installed macro files in directory @var{dir}. You can also
|
||||
set the @code{AC_MACRODIR} environment variable to a directory; this
|
||||
option overrides the environment variable.
|
||||
|
||||
@item --version
|
||||
@itemx -V
|
||||
Print the version number of @code{autoupdate} and exit.
|
||||
@item --localdir=@var{dir}
|
||||
@itemx -l @var{dir}
|
||||
Look for the package file @file{aclocal.m4} in directory @var{dir}
|
||||
instead of in the current directory.
|
||||
@end table
|
||||
|
||||
@node Changed Results, Changed Macro Writing, Invoking autoupdate, Upgrading
|
||||
|
||||
@ -9,6 +9,7 @@ autoupdate \- Update a configure.in to a newer Autoconf
|
||||
Update the TEMPLATE-FILE... if given, or `configure.in' by default, to
|
||||
the syntax of the current version of `autoconf'. The original files
|
||||
are backed up.
|
||||
.SS "Operation modes:"
|
||||
.TP
|
||||
\fB\-h\fR, \fB\-\-help\fR
|
||||
print this help, then exit
|
||||
@ -16,8 +17,17 @@ print this help, then exit
|
||||
\fB\-V\fR, \fB\-\-version\fR
|
||||
print version number, then exit
|
||||
.TP
|
||||
\fB\-v\fR, \fB\-\-verbose\fR
|
||||
verbosely report processing
|
||||
.TP
|
||||
\fB\-d\fR, \fB\-\-debug\fR
|
||||
don't remove temporary files
|
||||
.TP
|
||||
\fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR
|
||||
directory storing Autoconf's files
|
||||
directory storing Autoconf's macro files
|
||||
.TP
|
||||
\fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR
|
||||
directory storing the `aclocal.m4' file
|
||||
.SH AUTHOR
|
||||
Written by David J. MacKenzie.
|
||||
.SH "REPORTING BUGS"
|
||||
|
||||
@ -67,6 +67,8 @@ testsuite: atgeneral.m4 atspecific.m4 suite.m4 macros.m4 $(SUITE)
|
||||
# Used in many places.
|
||||
# - _AC_
|
||||
# Internal macros are used elsewhere.
|
||||
# - AC_OUTPUT
|
||||
# Already tested by `AT_TEST_MACRO'.
|
||||
#
|
||||
# Multiple `-e' to egrep are not portable, so join all the patterns together.
|
||||
# We use the fact that automake will replace all the `\\\n' with ` '.
|
||||
@ -80,6 +82,7 @@ FILTER_MACROS = egrep -v -e \
|
||||
^AC_LINKER_OPTION$$\
|
||||
^AC_LINK_FILES$$\
|
||||
^AC_LIST_MEMBER_OF$$\
|
||||
^AC_OUTPUT$$\
|
||||
^AC_PATH_(TOOL|PROG)S?$$\
|
||||
^AC_PROG_(CC|CXX|F77)_(GNU|WORKS)$$\
|
||||
^AC_REPLACE_FUNCS$$\
|
||||
|
||||
@ -100,10 +100,12 @@ PERL = perl
|
||||
# Used in many places.
|
||||
# - _AC_
|
||||
# Internal macros are used elsewhere.
|
||||
# - AC_OUTPUT
|
||||
# Already tested by `AT_TEST_MACRO'.
|
||||
#
|
||||
# Multiple `-e' to egrep are not portable, so join all the patterns together.
|
||||
# We use the fact that automake will replace all the `\\\n' with ` '.
|
||||
FILTER_MACROS = egrep -v -e `echo '^AC_ARG_VAR$$ ^AC_CANONICALIZE$$ ^AC_CHECK_(DECL|FILE|FUNC|HEADER|LIB|MEMBER|PROG|SIZEOF|TYPE)S?$$ ^AC_CONFIG ^AC_INIT ^AC_LANG ^AC_LINKER_OPTION$$ ^AC_LINK_FILES$$ ^AC_LIST_MEMBER_OF$$ ^AC_PATH_(TOOL|PROG)S?$$ ^AC_PROG_(CC|CXX|F77)_(GNU|WORKS)$$ ^AC_REPLACE_FUNCS$$ ^AC_SEARCH_LIBS$$ ^AC_TRY _AC_' | tr ' ' '|'`
|
||||
FILTER_MACROS = egrep -v -e `echo '^AC_ARG_VAR$$ ^AC_CANONICALIZE$$ ^AC_CHECK_(DECL|FILE|FUNC|HEADER|LIB|MEMBER|PROG|SIZEOF|TYPE)S?$$ ^AC_CONFIG ^AC_INIT ^AC_LANG ^AC_LINKER_OPTION$$ ^AC_LINK_FILES$$ ^AC_LIST_MEMBER_OF$$ ^AC_OUTPUT$$ ^AC_PATH_(TOOL|PROG)S?$$ ^AC_PROG_(CC|CXX|F77)_(GNU|WORKS)$$ ^AC_REPLACE_FUNCS$$ ^AC_SEARCH_LIBS$$ ^AC_TRY _AC_' | tr ' ' '|'`
|
||||
|
||||
|
||||
# The files which contains macro we check for syntax.
|
||||
|
||||
@ -160,27 +160,26 @@ AT_CLEANUP
|
||||
|
||||
# Check that AC_LINK_FILES and AC_OUTPUT are properly updated.
|
||||
# actest.m4 AU_ defines OSBOLETE to UPDATED.
|
||||
###FIXME: Disabled until there's a new autoupdate.
|
||||
###AT_SETUP(autoupdate)
|
||||
###
|
||||
###AT_DATA(configure.in,
|
||||
###[[AC_INIT
|
||||
###dnl The doc says 27 is a valid fubar.
|
||||
###fubar=27
|
||||
###AC_OUTPUT(Makefile, echo $fubar, fubar=$fubar)
|
||||
###]])
|
||||
###
|
||||
#### Checking `autoupdate'.
|
||||
###AT_CHECK([../autoupdate -m .. -l $at_srcdir -<configure.in], 0,
|
||||
###[[AC_INIT
|
||||
###dnl The doc says 27 is a valid fubar.
|
||||
###fubar=27
|
||||
###AC_CONFIG_FILES(Makefile)
|
||||
###AC_CONFIG_COMMANDS(default, [echo $fubar], [fubar=$fubar])
|
||||
###AC_OUTPUT
|
||||
###]], ignore)
|
||||
###
|
||||
###AT_CLEANUP
|
||||
AT_SETUP(autoupdate)
|
||||
|
||||
AT_DATA(configure.in,
|
||||
[[AC_INIT
|
||||
dnl The doc says 27 is a valid fubar.
|
||||
fubar=27
|
||||
AC_OUTPUT(Makefile, echo $fubar, fubar=$fubar)
|
||||
]])
|
||||
|
||||
# Checking `autoupdate'.
|
||||
AT_CHECK([../autoupdate -m $top_srcdir -<configure.in], 0,
|
||||
[[AC_INIT
|
||||
dnl The doc says 27 is a valid fubar.
|
||||
fubar=27
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_CONFIG_COMMANDS([default],[[echo $fubar]],[[fubar=$fubar]])
|
||||
AC_OUTPUT
|
||||
]], ignore)
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user