diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-24 22:56:47 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-24 22:56:47 +0000 |
commit | 345806cfca8f28703195cc4759d64b7a931459bf (patch) | |
tree | 271e7dcff2c22faf94b998baf5851f363afc864e | |
parent | 1355dba88229c766b951371d11cc2e5ff12761ff (diff) | |
download | autoconf-345806cfca8f28703195cc4759d64b7a931459bf.tar.gz |
Rework to use more-modern build style.
Many files are renamed; all uses of their names were changed.
* .x-sc_trailing_blank: Renamed from .x-sc_trailing_blank.
* .x-sc_useless_cpp_parens: New file.
* build-aux/config.guess: Renamed from config/config.guess. Update.
* build-aux/config.sub: Renamed from config/config.sub. Update.
* build-aux/elisp-comp: Renamed from config/elisp-comp.
* build-aux/install-sh: Renamed from config/install-sh. Update.
* build-aux/mdate-sh: Renamed from config/mdate-sh.
* build-aux/missing: Renamed from config/missing.
* build-aux/texinfo.tex: Renamed from config/texinfo.tex. Update.
* build-aux/vc-list-files: Renamed from config/vc-list-files.
* config/Makefile.am: Removed.
* config/mkinstalldirs: Removed.
* config/move-if-change: Removed.
* m4/m4.m4: Renamed from config/m4.m4. Add (C) to copyright notice.
* Makefile.am (SUBDIRS): Remove config.
(ACLOCAL_AMFLAGS): Include from m4, not config.
(EXTRA_DIST): Add config/announce-gen, config/prev-version.txt.
(WGET, WGETFLAGS): New macros, since Makefile.maint no longer does this.
(autom4te-update): Rewrite with a loop. Get from gnulib, not automake.
Fail if there's an error.
* Makefile.cfg (move_if_change): Remove.
(wget_files): Remove.
(cvs_executable_files): New macro.
(cvs_files): Use it. Remove mkinstalldirs. Add fdl.texi.
(executable-update): Use $(cvs_executable_files).
(local-checks-to-skip): Remove.
* Makefile.maint: Merge from coreutils, plus add our own changes
(gzip_rsyncable): New macro.
(GZIP_ENV): Use it.
(CVS_LIST): Use build-aux/vc-list-files.
(VERSION_REGEXP): New macro.
(local-checks-available): Add patch-check, $(syntax-check-rules),
check-AUTHORS.
(syntax-check-rules): Compute dynamically.
(sc_cast_of_x_alloc_return_value): Work even if no source files.
(sc_cast_of_alloca_return_value): Likewise.
(sc_prohibit_atoi_atof): Simplify regexp.
(sc_no_if_have_config_h, sc_require_config_h):
(sc_prohibit_assert_without_use,
(sc_obsolete_symbols): Check for O_NDELAY.
(sc_texi_notab): Remove.
(sc-changelog): Don't make an exception for '----' lines.
(.re-list): Remove, so we don't have a junk file behind.
(sc_system_h_headers): Remove the need for .re-list.
(sc_the_the): New rule.
(sc_tight_scope): Simplify.
(sc_trailing_space): Renamed from sc_trailing_blank.
(longopt_re): New macro.
(sc_two_space_separator_in_usage): New rule.
(sc_unmarked_diagnostics): Look at all files under CVS.
(sc_useless_cpp_parens, patch-check, check-AUTHORS): New rules.
(news-date-check, changelog-check): Version is OK.
(po-check): Look for lib files even if not in CVS.
(copyright-check): Use $() not ``.
(maintainer-distcheck): Do not depend on changelog-check.
(my-distcheck): Depend on $(release_archive_dir)/$(prev-tgz).
Also check for -Wpointer-arith.
(WGET, WGETFLAGS, tgz-md5, tgz-sha1, bz2-md5, bz2-sha1):
(xdelta-md5, xdelta-sha1, tgz-size, bz2-size, xd-size, rel-check):
Remove.
(announcement): Add --gpg-key-id arg.
(cvs-sv): Remove.
(move_if_change): Just use mv.
(local_updates: Remove wget-update, po-update.
(po_repo, do-po-update, po-update, wget_files, get-targets): Remove.
(config.guess-url_prefix, config.sub-url_prefix): Remove.
(ansi2knr.c-url_prefix, texinfo.tex-url_prefix):
(standards.texi-url_prefix, make-stds.texi-url_prefix, target, url):
($(get-targets)): Remove.
(cvs_files): Remove missing, mkinstalldirs, ansi2knr.c.
(gnulib_repo): Renamed from automake_repo. Get from gnulib now.
(cvs-update): Get from gnulib.
(emut_upload_commands): gnupload is in build-aux now.
(alpha beta major): Add changelog-check. Check version.
* configure.ac (AC_CONFIG_AUX_DIR): Renamed from config to build-aux.
(AC_CONFIG_FILES): Remove.
* bin/autoconf.as: Add spaces to avoid distcheck warning.
* config/announce-gen: Sync from coreutils.
* doc/make-stds.texi: Sync from gnulib.
* doc/standards.texi: Likewise.
* man/Makefile.am: Adjust for config -> build-aux renaming.
* tests/Makefile.am: Prefer $(FOO) to @FOO@.
* tests/local.at: Adjust from config -> build-aux renaming.
* tests/tools.at: Likewise.
* tests/torture.at: Likewise.
-rw-r--r-- | .x-sc_space_tab | 4 | ||||
-rw-r--r-- | .x-sc_sun_os_names | 2 | ||||
-rw-r--r-- | .x-sc_trailing_blank | 2 | ||||
-rw-r--r-- | .x-sc_trailing_space | 2 | ||||
-rw-r--r-- | .x-sc_useless_cpp_parens | 2 | ||||
-rw-r--r-- | ChangeLog | 123 | ||||
-rw-r--r-- | Makefile.am | 31 | ||||
-rw-r--r-- | Makefile.cfg | 33 | ||||
-rw-r--r-- | Makefile.maint | 330 | ||||
-rw-r--r-- | bin/autoconf.as | 4 | ||||
-rwxr-xr-x | build-aux/config.guess (renamed from config/config.guess) | 8 | ||||
-rwxr-xr-x | build-aux/config.sub (renamed from config/config.sub) | 12 | ||||
-rwxr-xr-x | build-aux/elisp-comp (renamed from config/elisp-comp) | 0 | ||||
-rwxr-xr-x | build-aux/install-sh (renamed from config/install-sh) | 145 | ||||
-rwxr-xr-x[-rw-r--r--] | build-aux/mdate-sh (renamed from config/mdate-sh) | 0 | ||||
-rwxr-xr-x | build-aux/missing (renamed from config/missing) | 0 | ||||
-rw-r--r-- | build-aux/texinfo.tex (renamed from config/texinfo.tex) | 44 | ||||
-rwxr-xr-x | build-aux/vc-list-files | 59 | ||||
-rw-r--r-- | config/Makefile.am | 40 | ||||
-rw-r--r-- | config/Makefile.in | 295 | ||||
-rwxr-xr-x | config/announce-gen | 52 | ||||
-rwxr-xr-x | config/mkinstalldirs | 161 | ||||
-rwxr-xr-x | config/move-if-change | 22 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | lib/m4sugar/Makefile.am | 14 | ||||
-rw-r--r-- | m4/m4.m4 (renamed from config/m4.m4) | 2 | ||||
-rw-r--r-- | man/Makefile.am | 11 | ||||
-rw-r--r-- | tests/Makefile.am | 17 | ||||
-rw-r--r-- | tests/local.at | 3 | ||||
-rw-r--r-- | tests/tools.at | 5 | ||||
-rw-r--r-- | tests/torture.at | 6 |
31 files changed, 561 insertions, 871 deletions
diff --git a/.x-sc_space_tab b/.x-sc_space_tab index 102ebc7f..f1d23c7b 100644 --- a/.x-sc_space_tab +++ b/.x-sc_space_tab @@ -1,4 +1,4 @@ -config/config.guess -config/config.sub +build-aux/config.guess +build-aux/config.sub aclocal.m4 configure diff --git a/.x-sc_sun_os_names b/.x-sc_sun_os_names index d355a198..c05fdfdf 100644 --- a/.x-sc_sun_os_names +++ b/.x-sc_sun_os_names @@ -1 +1 @@ -config/config.guess +build-aux/config.guess diff --git a/.x-sc_trailing_blank b/.x-sc_trailing_blank new file mode 100644 index 00000000..d97c0b67 --- /dev/null +++ b/.x-sc_trailing_blank @@ -0,0 +1,2 @@ +build-aux/texinfo.tex +doc/standards.texi diff --git a/.x-sc_trailing_space b/.x-sc_trailing_space deleted file mode 100644 index 7fce6fef..00000000 --- a/.x-sc_trailing_space +++ /dev/null @@ -1,2 +0,0 @@ -config/texinfo.tex -doc/standards.texi diff --git a/.x-sc_useless_cpp_parens b/.x-sc_useless_cpp_parens new file mode 100644 index 00000000..9c134e2d --- /dev/null +++ b/.x-sc_useless_cpp_parens @@ -0,0 +1,2 @@ +build-aux/config.guess +doc/standards.texi @@ -1,5 +1,93 @@ 2006-08-24 Paul Eggert <eggert@cs.ucla.edu> + Rework to use more-modern build style. + Many files are renamed; all uses of their names were changed. + * .x-sc_trailing_blank: Renamed from .x-sc_trailing_blank. + * .x-sc_useless_cpp_parens: New file. + * build-aux/config.guess: Renamed from config/config.guess. Update. + * build-aux/config.sub: Renamed from config/config.sub. Update. + * build-aux/elisp-comp: Renamed from config/elisp-comp. + * build-aux/install-sh: Renamed from config/install-sh. Update. + * build-aux/mdate-sh: Renamed from config/mdate-sh. + * build-aux/missing: Renamed from config/missing. + * build-aux/texinfo.tex: Renamed from config/texinfo.tex. Update. + * build-aux/vc-list-files: Renamed from config/vc-list-files. + * config/Makefile.am: Removed. + * config/mkinstalldirs: Removed. + * config/move-if-change: Removed. + * m4/m4.m4: Renamed from config/m4.m4. Add (C) to copyright notice. + * Makefile.am (SUBDIRS): Remove config. + (ACLOCAL_AMFLAGS): Include from m4, not config. + (EXTRA_DIST): Add config/announce-gen, config/prev-version.txt. + (WGET, WGETFLAGS): New macros, since Makefile.maint no longer does this. + (autom4te-update): Rewrite with a loop. Get from gnulib, not automake. + Fail if there's an error. + * Makefile.cfg (move_if_change): Remove. + (wget_files): Remove. + (cvs_executable_files): New macro. + (cvs_files): Use it. Remove mkinstalldirs. Add fdl.texi. + (executable-update): Use $(cvs_executable_files). + (local-checks-to-skip): Remove. + * Makefile.maint: Merge from coreutils, plus add our own changes + (gzip_rsyncable): New macro. + (GZIP_ENV): Use it. + (CVS_LIST): Use build-aux/vc-list-files. + (VERSION_REGEXP): New macro. + (local-checks-available): Add patch-check, $(syntax-check-rules), + check-AUTHORS. + (syntax-check-rules): Compute dynamically. + (sc_cast_of_x_alloc_return_value): Work even if no source files. + (sc_cast_of_alloca_return_value): Likewise. + (sc_prohibit_atoi_atof): Simplify regexp. + (sc_no_if_have_config_h, sc_require_config_h): + (sc_prohibit_assert_without_use, + (sc_obsolete_symbols): Check for O_NDELAY. + (sc_texi_notab): Remove. + (sc-changelog): Don't make an exception for '----' lines. + (.re-list): Remove, so we don't have a junk file behind. + (sc_system_h_headers): Remove the need for .re-list. + (sc_the_the): New rule. + (sc_tight_scope): Simplify. + (sc_trailing_space): Renamed from sc_trailing_blank. + (longopt_re): New macro. + (sc_two_space_separator_in_usage): New rule. + (sc_unmarked_diagnostics): Look at all files under CVS. + (sc_useless_cpp_parens, patch-check, check-AUTHORS): New rules. + (news-date-check, changelog-check): Version is OK. + (po-check): Look for lib files even if not in CVS. + (copyright-check): Use $() not ``. + (maintainer-distcheck): Do not depend on changelog-check. + (my-distcheck): Depend on $(release_archive_dir)/$(prev-tgz). + Also check for -Wpointer-arith. + (WGET, WGETFLAGS, tgz-md5, tgz-sha1, bz2-md5, bz2-sha1): + (xdelta-md5, xdelta-sha1, tgz-size, bz2-size, xd-size, rel-check): + Remove. + (announcement): Add --gpg-key-id arg. + (cvs-sv): Remove. + (move_if_change): Just use mv. + (local_updates: Remove wget-update, po-update. + (po_repo, do-po-update, po-update, wget_files, get-targets): Remove. + (config.guess-url_prefix, config.sub-url_prefix): Remove. + (ansi2knr.c-url_prefix, texinfo.tex-url_prefix): + (standards.texi-url_prefix, make-stds.texi-url_prefix, target, url): + ($(get-targets)): Remove. + (cvs_files): Remove missing, mkinstalldirs, ansi2knr.c. + (gnulib_repo): Renamed from automake_repo. Get from gnulib now. + (cvs-update): Get from gnulib. + (emut_upload_commands): gnupload is in build-aux now. + (alpha beta major): Add changelog-check. Check version. + * configure.ac (AC_CONFIG_AUX_DIR): Renamed from config to build-aux. + (AC_CONFIG_FILES): Remove. + * bin/autoconf.as: Add spaces to avoid distcheck warning. + * config/announce-gen: Sync from coreutils. + * doc/make-stds.texi: Sync from gnulib. + * doc/standards.texi: Likewise. + * man/Makefile.am: Adjust for config -> build-aux renaming. + * tests/Makefile.am: Prefer $(FOO) to @FOO@. + * tests/local.at: Adjust from config -> build-aux renaming. + * tests/tools.at: Likewise. + * tests/torture.at: Likewise. + * NEWS: The C99 check now tests for vararg macros and 64-bit preprocessor ints. * doc/autoconf.texi (C Compiler): Document // comments, va_copy. @@ -3346,7 +3434,7 @@ 2005-05-13 Paul Eggert <eggert@cs.ucla.edu> * AUTHORS, BUGS, COPYING, ChangeLog, ChangeLog.0, ChangeLog.1, - ChangeLog.2, GNUmakefile, HACKING, Makefile.am, Makefile.cfg, + ChangeLog.2, GNUmakefile, Makefile.am, Makefile.cfg, Makefile.maint, NEWS, README, README-alpha, TODO, configure.ac, bin/Makefile.am, bin/autoconf.as, bin/autoheader.in, bin/autom4te.in, bin/autoreconf.in, bin/autoscan.in, @@ -4254,7 +4342,6 @@ 2004-11-28 Stepan Kasal <kasal@ucw.cz> - * HACKING: Refer to "coreutils", not "File, Shell or Text utils". * lib/m4sugar/m4sh.m4 (AS_HELP_STRING): A typo in the comment. 2004-11-26 Paul Eggert <eggert@cs.ucla.edu> @@ -11819,23 +11906,25 @@ * configure.in: Bump to 2.50a. ------ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + ----- + + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software + Foundation, Inc. -This file is part of GNU Autoconf. + This file is part of GNU Autoconf. -GNU Autoconf 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. + GNU Autoconf 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. -GNU Autoconf 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. + GNU Autoconf 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 autoconf; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. + You should have received a copy of the GNU General Public License + along with autoconf; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. diff --git a/Makefile.am b/Makefile.am index 3e20b841..d51e2b39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,8 @@ ## Makefile for Autoconf. -## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software -## Foundation, Inc. +## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006 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 @@ -22,13 +22,14 @@ # bin/ must be run first, as it builds executables needed for tests. # autom4te uses autotest.m4f to generate `testsuite', so build tests last. -SUBDIRS = bin . lib config man doc tests +SUBDIRS = bin . lib man doc tests -ACLOCAL_AMFLAGS = -I config +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \ BUGS \ - GNUmakefile Makefile.maint Makefile.cfg + GNUmakefile Makefile.maint Makefile.cfg \ + config/announce-gen config/prev-version.txt MAINTAINERCLEANFILES = $(srcdir)/INSTALL @@ -62,6 +63,9 @@ maintainer-check-tests: ## Updating Perl files from Automake. ## ## ----------------------------------- ## +WGET = wget +WGETFLAGS = -C off + ## Fetch the latest versions of files we care about. automake_cvsweb = \ http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/automake @@ -76,16 +80,13 @@ autom4te_files = \ autom4te-update: rm -f -r Fetchdir > /dev/null 2>&1 - mkdir Fetchdir; mkdir Fetchdir/Autom4te -## If a get fails then that is a problem. - (cd Fetchdir && \ - $(WGET) $(automake_cvsweb)/lib/Automake/Configure_ac.pm?$(automake_cvsargs) -O Autom4te/Configure_ac.pm; \ - $(WGET) $(automake_cvsweb)/lib/Automake/Channels.pm?$(automake_cvsargs) -O Autom4te/Channels.pm; \ - $(WGET) $(automake_cvsweb)/lib/Automake/FileUtils.pm?$(automake_cvsargs) -O Autom4te/FileUtils.pm; \ - $(WGET) $(automake_cvsweb)/lib/Automake/Struct.pm?$(automake_cvsargs) -O Autom4te/Struct.pm; \ - $(WGET) $(automake_cvsweb)/lib/Automake/XFile.pm?$(automake_cvsargs) -O Autom4te/XFile.pm; \ - :) + mkdir -p Fetchdir/Autom4te + for file in $(autom4te_files); do \ + $(WGET) $(WGET_FLAGS) \ + "$(automake_cvsweb)/lib/$file?$(automake_cvsargs)" \ + -O "Fetchdir/$$file" || exit; \ + done perl -pi -e 's/Automake::/Autom4te::/g' Fetchdir/Autom4te/*.pm for file in $(autom4te_files); do \ - $(move_if_change) Fetchdir/$$file $(srcdir)/lib/$$file; \ + $(move_if_change) Fetchdir/$$file $(srcdir)/lib/$$file || exit; \ done diff --git a/Makefile.cfg b/Makefile.cfg index b1d1530a..c3843df2 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -17,7 +17,6 @@ # 02110-1301, USA. prev_version_file = $(srcdir)/config/prev-version.txt -move_if_change = $(srcdir)/config/move-if-change announce_gen = $(srcdir)/config/announce-gen release_archive_dir = releases @@ -32,19 +31,19 @@ url_dir_list = \ ftp://$(gnu_rel_host).gnu.org/gnu/autoconf # Files to update automatically. -wget_files = \ - $(srcdir)/doc/standards.texi \ +cvs_executable_files = \ + $(srcdir)/build-aux/config.guess \ + $(srcdir)/build-aux/config.sub \ + $(srcdir)/build-aux/elisp-comp \ + $(srcdir)/build-aux/install-sh \ + $(srcdir)/build-aux/mdate-sh \ + $(srcdir)/build-aux/missing \ + +cvs_files = $(cvs_executable_files) \ + $(srcdir)/build-aux/texinfo.tex \ + $(srcdir)/doc/fdl.texi \ $(srcdir)/doc/make-stds.texi \ - $(srcdir)/config/config.guess \ - $(srcdir)/config/config.sub \ - $(srcdir)/config/texinfo.tex - -cvs_files = \ - $(srcdir)/config/elisp-comp \ - $(srcdir)/config/install-sh \ - $(srcdir)/config/mdate-sh \ - $(srcdir)/config/missing \ - $(srcdir)/config/mkinstalldirs + $(srcdir)/doc/standards.texi # Keep executables executable. Make it robust to parallel makes. local_updates = executable-update @@ -52,12 +51,8 @@ local_updates = executable-update .PHONY: executable-update # autom4te-update is defined in Makefile.am. executable-update: wget-update cvs-update autom4te-update - chmod a+x $(cvs_files) \ - $(srcdir)/config/config.guess \ - $(srcdir)/config/config.sub + chmod a+x $(cvs_executable_files) # Tests not to run. local-checks-to-skip ?= \ - po-check m4-check author_mark_check \ - strftime-check syntax-check makefile_path_separator_check \ - makefile-check + sc_unmarked_diagnostics diff --git a/Makefile.maint b/Makefile.maint index 4bfb09c6..71281f04 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -26,25 +26,14 @@ ME := Makefile.maint # Do not save the original name or timestamp in the .tar.gz file. # Use --rsyncable if available. -GZIP_ENV = \ - "--no-name --best$$( \ - case $$(gzip --help) in \ - (*--rsyncable*) echo ' --rsyncable';; \ - esac \ - )" +gzip_rsyncable := \ + $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null && echo --rsyncable) +GZIP_ENV = '--no-name --best $(gzip_rsyncable)' CVS = cvs -CVS_LIST = sh -c ' \ - (cvsu --find --types=AFGM $$*) 2>/dev/null || \ - awk -F/ '\''{ \ - if (!$$1 && $$3 !~ /^-/) { \ - f=FILENAME; \ - sub(/CVS\/Entries/, "", f); \ - print f $$2; \ - }}'\'' \ - $$(find $${*-*} -name Entries -print) /dev/null \ - ' dummy +# cvsu is part of the cvsutils package: http://www.red-bean.com/cvsutils/ +CVS_LIST = build-aux/vc-list-files CVS_LIST_EXCEPT = \ $(CVS_LIST) | if test -f .x-$@; then grep -vEf .x-$@; else grep -v ChangeLog; fi @@ -54,6 +43,7 @@ ifeq ($(origin prev_version_file), undefined) endif PREV_VERSION := $(shell cat $(prev_version_file)) +VERSION_REGEXP = $(subst .,\.,$(VERSION)) tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]') tag-this-version = $(subst .,_,$(VERSION)) @@ -74,37 +64,25 @@ export LC_ALL = C ## Sanity checks. ## ## --------------- ## +# FIXME: add a check to prohibit definition in src/*.c of symbols defined +# in system.h. E.g. today I removed from tail.c a useless definition of +# ENOSYS. It was useless because system.h ensures it's defined. + # Checks that don't require cvs. # Run `changelog-check' last, as previous test may reveal problems requiring # new ChangeLog entries. local-checks-available = \ po-check copyright-check writable-files m4-check author_mark_check \ - changelog-check strftime-check syntax-check makefile_path_separator_check \ - makefile-check + changelog-check patch-check strftime-check $(syntax-check-rules) \ + makefile_path_separator_check \ + makefile-check check-AUTHORS .PHONY: $(local-checks-available) local-check = $(filter-out $(local-checks-to-skip), $(local-checks-available)) +# Collect the names of rules starting with `sc_'. +syntax-check-rules := $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' $(ME)) .PHONY: $(syntax-check-rules) -syntax-check-rules = \ - sc_cast_of_argument_to_free \ - sc_cast_of_x_alloc_return_value \ - sc_cast_of_alloca_return_value \ - sc_changelog \ - sc_dd_max_sym_length \ - sc_error_exit_success \ - sc_file_system \ - sc_obsolete_symbols \ - sc_prohibit_atoi_atof \ - sc_prohibit_jm_in_m4 \ - sc_root_tests \ - sc_space_tab \ - sc_sun_os_names \ - sc_system_h_headers \ - sc_tight_scope \ - sc_trailing_space \ - sc_unmarked_diagnostics \ - sc_texi_notab syntax-check: $(syntax-check-rules) # @shopt -s nullglob; \ @@ -114,7 +92,7 @@ syntax-check: $(syntax-check-rules) # exit 1; } || : # grep -nE '^# *include <(string|stdlib)\.h>' \ -# $(srcdir)/{lib,src}/*.[chy] /dev/null && \ +# $(srcdir)/{lib,src}/*.[chly] /dev/null && \ # { echo '$(ME): FIXME' 1>&2; \ # exit 1; } || : # FIXME: don't allow `#include .strings\.h' anywhere @@ -130,20 +108,19 @@ sc_cast_of_x_alloc_return_value: @shopt -s nullglob; \ grep -nE --exclude=$(srcdir)/lib/regex.c \ '\*\) *x(m|c|re)alloc\>' \ - $(srcdir)/{lib,src}/*.[chy] /dev/null && \ + $(srcdir)/{lib,src}/*.[chly] /dev/null && \ { echo '$(ME): don'\''t cast x*alloc return value' 1>&2; \ exit 1; } || : sc_cast_of_alloca_return_value: @shopt -s nullglob; \ grep -nE '\*\) *alloca\>' \ - $(srcdir)/src/*.[chy] /dev/null && \ + $(srcdir)/src/*.[chly] /dev/null && \ { echo '$(ME): don'\''t cast alloca return value' 1>&2; \ exit 1; } || : sc_space_tab: - @grep -n '[ ] ' \ - $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '[ ] ' $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): found SPACE-TAB sequence; remove the SPACE' \ 1>&2; exit 1; } || : @@ -151,8 +128,7 @@ sc_space_tab: # They provide no error checking mechanism. # Instead, use strto* functions. sc_prohibit_atoi_atof: - @grep -nE '\<(ato[filq]|ato''ll)\>' \ - $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\<ato([filq]|ll)\>' $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): do not use ato''f, ato''i, ato''l, ato''ll, or ato''q' \ 1>&2; exit 1; } || : @@ -165,32 +141,44 @@ sc_error_exit_success: exit 1; } || : sc_file_system: - @grep -ni 'file''system' \ - $$($(CVS_LIST_EXCEPT)) && \ + @grep -ni 'file''system' $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): found use of "file''system";' \ 'rewrite to use "file system"' 1>&2; \ exit 1; } || : +sc_no_if_have_config_h: + @grep -n '^# *if HAVE_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \ + { echo '$(ME): found use of #if HAVE_CONFIG_H; use #ifdef' \ + 1>&2; exit 1; } || : + +# Nearly all .c files must include <config.h>. +sc_require_config_h: + @grep -L '^# *include <config\.h>' /dev/null \ + $$($(CVS_LIST_EXCEPT) | grep '\.c$$') \ + | grep -v /dev/null && \ + { echo '$(ME): the above files do not include <config.h>' \ + 1>&2; exit 1; } || : + +# Prohibit the inclusion of assert.h without an actual use of assert. +sc_prohibit_assert_without_use: + @files=$$(grep -l '# *include <assert\.h>' /dev/null \ + $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \ + grep -L '\<assert (' $$files /dev/null \ + | grep -v /dev/null && \ + { echo "$(ME): the above files include <assert.h> but don't use it" \ + 1>&2; exit 1; } || : + sc_obsolete_symbols: - @grep -nE '\<(HAVE_''FCNTL_H)\>' \ + @grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \ $$($(CVS_LIST_EXCEPT)) && \ - { echo '$(ME): do not use HAVE_''FCNTL_H' \ + { echo '$(ME): do not use HAVE''_FCNTL_H or O''_NDELAY' \ 1>&2; exit 1; } || : # FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ -# Do not use TABs in .texi files, except in verbatim environments. -sc_texi_notab: - @sed '/^@verbatim/,/^@end verbatim/d' /dev/null \ - $$($(CVS_LIST_EXCEPT) | grep -E '\.(texi|txi|texinfo)$$' ) \ - | grep '[ ]' && \ - { echo '$(ME): Do not use TABs in texinfo files outside of @verbatim' \ - 1>&2; exit 1; } || : - # Each nonempty line must start with a year number, or a TAB. sc_changelog: - @sed '/^-----/,$$d' $$(find . -maxdepth 2 -name ChangeLog) \ - | grep -n '^[^12 ]' && \ + @grep -n '^[^12 ]' $$(find . -maxdepth 2 -name ChangeLog) && \ { echo '$(ME): found unexpected prefix in a ChangeLog' 1>&2; \ exit 1; } || : @@ -202,7 +190,7 @@ ifneq ($(wildcard $(dd_c)),) @len=$$( (sed -n '/conversions\[\] =$$/,/^};/p' $(dd_c);\ sed -n '/flags\[\] =$$/,/^};/p' $(dd_c) ) \ |sed -n '/"/s/^[^"]*"\([^"]*\)".*/\1/p' \ - | wc --max-line-length); \ + | wc --max-line-length); \ max=$$(sed -n '/^#define LONGEST_SYMBOL /s///p' $(dd_c) \ |tr -d '"' | wc --max-line-length); \ if test "$$len" = "$$max"; then :; else \ @@ -215,9 +203,9 @@ endif # On 2004-04-13, they were all changed to start with gl_ instead. # Make sure that none are inadvertently reintroduced. sc_prohibit_jm_in_m4: - @grep -nE 'jm_[A-Z]' /dev/null \ - $$($(CVS_LIST) $(srcdir)/m4 |grep '\.m4$$') && \ - { echo '$(ME): do not use jm_ in m4 macro names' \ + @grep -nE 'jm_[A-Z]' \ + $$($(CVS_LIST) $(srcdir)/m4 |grep '\.m4$$') && \ + { echo '$(ME): do not use jm_ in m4 macro names' \ 1>&2; exit 1; } || : sc_root_tests: @@ -232,22 +220,16 @@ sc_root_tests: && { echo 'tests/Makefile.am: missing check-root action'>&2; \ exit 1; } || : -# Create a list of regular expressions matching the names -# of files included from system.h. Exclude a couple. -.re-list: - @shopt -s nullglob; \ - sed -n '/^# *include /s///p' $(srcdir)/src/system.[h] /dev/null \ - | grep -Ev 'sys/(param|file)\.h' \ - | sed 's/ .*//;;s/^["<]/^# *include [<"]/;s/\.h[">]$$/\\.h[">]/' \ - > $@-t - @mv $@-t $@ - # Files in src/ should not include directly any of # the headers already included via system.h. -sc_system_h_headers: .re-list - @if test -f $(srcdir)/src/system.h; then \ - trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15; \ - grep -nE -f .re-list \ +sc_system_h_headers: + @if test -f $(srcdir)/src/system.h; then \ + pat=$$( \ + sed -n '/^# *include /s///p' $(srcdir)/src/system.h /dev/null \ + | grep -Ev 'sys/(param|file)\.h' \ + | sed 's/ .*//;;s/^["<]/^# *include [<"]/;s/\.h[">]$$/\\.h[">]/' \ + ) && \ + grep -nE -f "$pat" \ $$($(CVS_LIST) src | \ grep -Ev '((copy|system)\.h|parse-gram\.c)$$') \ && { echo '$(ME): the above are already included via system.h'\ @@ -257,29 +239,62 @@ sc_system_h_headers: .re-list sc_sun_os_names: @grep -nEi \ 'solaris[^[:alnum:]]*2\.(7|8|9|[1-9][0-9])|sunos[^[:alnum:]][6-9]' \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): found misuse of Sun OS version numbers' 1>&2; \ exit 1; } || : +sc_the_the: + @grep -ni '\<the ''the\>' $$($(CVS_LIST_EXCEPT)) && \ + { echo '$(ME): found use of "the ''the";' 1>&2; \ + exit 1; } || : + sc_tight_scope: - @if test -d src; then $(MAKE) -C src $@; else :; fi + test ! -d src || $(MAKE) -C src $@ -sc_trailing_space: - @grep -n '[ ]$$' \ - $$($(CVS_LIST_EXCEPT)) && \ - { echo '$(ME): found trailing space(s)' \ +sc_trailing_blank: + @grep -n '[ ]$$' $$($(CVS_LIST_EXCEPT)) && \ + { echo '$(ME): found trailing blank(s)' \ + 1>&2; exit 1; } || : + +# Match lines like the following, but where there is only one space +# between the options and the description: +# -D, --all-repeated[=delimit-method] print all duplicate lines\n +longopt_re = --[a-z][0-9A-Za-z-]*(\[=[0-9A-Za-z-]*\])? +sc_two_space_separator_in_usage: + @grep -nE '^ *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$' \ + $$($(CVS_LIST_EXCEPT)) && \ + { echo "$(ME): help2man requires at least two spaces between"; \ + echo "$(ME): an option and its description"; \ 1>&2; exit 1; } || : # Look for diagnostics that aren't marked for translation. # This won't find any for which error's format string is on a separate line. sc_unmarked_diagnostics: - @shopt -s nullglob; \ - grep -nE '\<error \([^"]*"[^"]*[a-z]{3}' \ - $(srcdir)/{lib,src}/*.c /dev/null \ - | grep -v '_(' && \ + @grep -nE \ + '\<error \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \ + | grep -v '_''(' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : +# Avoid useless parentheses like those in this example: +# #if defined (SYMBOL) || defined (SYM2) +sc_useless_cpp_parens: + @grep -n '^# *if .*defined *(' $$($(CVS_LIST_EXCEPT)) && \ + { echo '$(ME): found useless parentheses in cpp directive' \ + 1>&2; exit 1; } || : + +# Ensure that the c99-to-c89 patch applies cleanly. +patch-check: + if test -f src/c99-to-c89.diff; then \ + rm -rf src-c89 $@.1 $@.2 && \ + cp -a src src-c89 && \ + (cd src-c89; patch -V never --fuzz=0) < src/c99-to-c89.diff \ + > $@.1 2>&1 && \ + { grep -v '^patching file ' $@.1 > $@.2 || :; } && \ + test -s $@.2 && \ + rm -rf src-c89 $@.1 $@.2; \ + fi + # Ensure that date's --help output stays in sync with the info # documentation for GNU strftime. The only exception is %N, # which date accepts but GNU strftime does not. @@ -295,6 +310,9 @@ strftime-check: rm -f $@-src $@-info; \ fi +check-AUTHORS: + test ! -d src || $(MAKE) -C src $@ + # Ensure that we use only the standard $(VAR) notation, # not @...@ in Makefile.am, now that we can rely on automake # to emit a definition for each substituted variable. @@ -304,15 +322,17 @@ makefile-check: news-date-check: NEWS today=`date +%Y-%m-%d`; \ - if head NEWS | grep $$today >/dev/null; then \ + if head NEWS | grep '^\*.* $(VERSION_REGEXP) ('$$today')' \ + >/dev/null; then \ :; \ else \ - echo "today's date is not in NEWS" 1>&2; \ + echo "version or today's date is not in NEWS" 1>&2; \ exit 1; \ fi changelog-check: - if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \ + if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$' \ + >/dev/null; then \ :; \ else \ echo "$(VERSION) not in ChangeLog" 1>&2; \ @@ -326,13 +346,16 @@ m4-check: exit 1; } || : # Verify that all source files using _() are listed in po/POTFILES.in. -# FIXME: don't hard-code src/false.c below; use a more general mechanism. +# FIXME: don't hard-code file names below; use a more general mechanism. po-check: if test -f po/POTFILES.in; then \ grep -E -v '^(#|$$)' po/POTFILES.in \ | grep -v '^src/false\.c$$' | sort > $@-1; \ files=; \ - for file in lib/*.[chly] src/*.[chly]; do \ + for file in $$($(CVS_LIST_EXCEPT)) lib/*.[ch]; do \ + case $$file in \ + djgpp/* | man/*) continue;; \ + esac; \ case $$file in \ *.[ch]) \ base=`expr " $$file" : ' \(.*\)\..'`; \ @@ -340,7 +363,7 @@ po-check: esac; \ files="$$files $$file"; \ done; \ - grep -E -l '\bN?_\([^)"]*("|$$)' $$files | sort > $@-2; \ + grep -E -l '\bN?_\([^)"]*("|$$)' $$files | sort -u > $@-2; \ diff -u $@-1 $@-2 || exit 1; \ rm -f $@-1 $@-2; \ fi @@ -382,7 +405,7 @@ v_etc_file = lib/version-etc.c # Make sure that the copyright date in $(v_etc_file) is up to date. copyright-check: @if test -f $(v_etc_file); then \ - grep "enum { COPYRIGHT_YEAR = `date +%Y` };" $(v_etc_file) \ + grep 'enum { COPYRIGHT_YEAR = '$$(date +%Y)' };' $(v_etc_file) \ >/dev/null \ || { echo 'out of date copyright in $(v_etc_file); update it' 1>&2; \ exit 1; }; \ @@ -408,7 +431,7 @@ cvs-diff-check: cvs-check: cvs-diff-check cvs-tag-check -maintainer-distcheck: changelog-check +maintainer-distcheck: $(MAKE) distcheck $(MAKE) my-distcheck @@ -433,18 +456,19 @@ null_AM_MAKEFLAGS = \ # Detect format-string/arg-list mismatches that would normally be obscured # by the use of _(). The --disable-nls effectively defines away that macro, # and building with CFLAGS='-Wformat -Werror' causes any format warning to be -# treated as a failure. Also, check for shadowing problems with -Wshadow. +# treated as a failure. Also, check for shadowing problems with -Wshadow, +# and for pointer arithmetic problems with -Wpointer-arith. # These CFLAGS are pretty strict. If you build this target, you probably # have to have a recent version of gcc and glibc headers. TMPDIR ?= /tmp t=$(TMPDIR)/$(PACKAGE)/test -my-distcheck: $(local-check) +my-distcheck: $(local-check) $(release_archive_dir)/$(prev-tgz) -rm -rf $(t) mkdir -p $(t) GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz cd $(t)/$(distdir) \ && ./configure --disable-nls \ - && $(MAKE) CFLAGS='-Werror -Wall -Wformat -Wshadow' \ + && $(MAKE) CFLAGS='-Werror -Wall -Wformat -Wshadow -Wpointer-arith' \ AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \ && $(MAKE) dvi \ && $(MAKE) check \ @@ -457,28 +481,6 @@ my-distcheck: $(local-check) echo "$(distdir).tar.gz is ready for distribution"; \ echo "========================" -WGET = wget -WGETFLAGS = -C off - -tgz-md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/ -//') -tgz-sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/ -//') -bz2-md5 = $(shell md5sum < $(my_distdir).tar.bz2|sed 's/ -//') -bz2-sha1 = $(shell sha1sum < $(my_distdir).tar.bz2|sed 's/ -//') -xdelta-md5 = $(shell md5sum < $(xd-delta)|sed 's/ -//') -xdelta-sha1 = $(shell sha1sum < $(xd-delta)|sed 's/ -//') -tgz-size = $(shell du --human $(my_distdir).tar.gz|sed 's/\([MkK]\).*/ \1B/') -bz2-size = $(shell du --human $(my_distdir).tar.bz2|sed 's/\([MkK]\).*/ \1B/') -xd-size = $(shell du --human $(xd-delta)|sed 's/\([MkK]\).*/ \1B/') - -rel-check: - tarz=/tmp/rel-check-tarz-$$$$; \ - md5_tmp=/tmp/rel-check-md5-$$$$; \ - set -e; \ - trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \ - $(WGET) $(WGETFLAGS) -q --output-document=$$tarz $(url); \ - echo "$(md5) -" > $$md5_tmp; \ - md5sum -c $$md5_tmp < $$tarz - prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta @@ -490,6 +492,7 @@ announcement: NEWS ChangeLog $(rel-files) --prev=$(PREV_VERSION) \ --curr=$(VERSION) \ --release-archive-directory=$(release_archive_dir) \ + --gpg-key-id=$(gpg_key_ID) \ --news=NEWS \ $(addprefix --url-dir=, $(url_dir_list)) \ @@ -500,10 +503,9 @@ announcement: NEWS ChangeLog $(rel-files) ftp-gnu = ftp://ftp.gnu.org/gnu www-gnu = http://www.gnu.org -cvs-sv = http://cvs.savannah.gnu.org/viewcvs/~checkout~ -# Use mv, if you don't have/want move-if-change. -move_if_change ?= move-if-change +# Use mv-if-change if you prefer it. +move_if_change ?= mv # --------------------- # @@ -511,94 +513,42 @@ move_if_change ?= move-if-change # --------------------- # .PHONY: update -local_updates ?= wget-update cvs-update po-update +local_updates ?= cvs-update update: $(local_updates) -# ------------------- # -# Updating PO files. # -# ------------------- # - -po_repo = http://www.iro.umontreal.ca/contrib/po/maint/$(PACKAGE) -.PHONY: do-po-update po-update -do-po-update: - tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\ - rm -rf $$tmppo && \ - mkdir $$tmppo && \ - (cd $$tmppo && \ - $(WGET) $(WGETFLAGS) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\ - cp $$tmppo/*.po po - cd po && $(MAKE) update-po - $(MAKE) po-check - -po-update: - if test -d "po"; then \ - $(MAKE) do-po-update; \ - fi - # -------------------------- # # Updating GNU build tools. # # -------------------------- # -# The following pseudo table associates a local directory and a URL -# with each of the files that belongs to some other package and is -# regularly updated from the specified URL. -wget_files ?= \ - $(srcdir)/build-aux/config.guess \ - $(srcdir)/build-aux/config.sub \ - $(srcdir)/build-aux/texinfo.tex \ - $(srcdir)/src/ansi2knr.c - -get-targets = $(patsubst %, get-%, $(wget_files)) - -config.guess-url_prefix = $(cvs-sv)/config/config/ -config.sub-url_prefix = $(cvs-sv)/config/config/ - -ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/ - -texinfo.tex-url_prefix = $(cvs-sv)/gnulib/gnulib/build-aux/ - -standards.texi-url_prefix = $(cvs-sv)/gnulib/gnulib/doc/ -make-stds.texi-url_prefix = $(standards.texi-url_prefix) - -target = $(patsubst get-%, %, $@) -url = $($(notdir $(target))-url_prefix)$(notdir $(target)) - -.PHONY: $(get-targets) -$(get-targets): - $(WGET) $(WGETFLAGS) $(url) -O $(target).t \ - && $(move_if_change) $(target).t $(target) - cvs_files ?= \ $(srcdir)/build-aux/depcomp \ $(srcdir)/build-aux/install-sh \ - $(srcdir)/build-aux/missing \ - $(srcdir)/build-aux/mkinstalldirs \ - $(srcdir)/src/ansi2knr.c -automake_repo=:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/automake + $(srcdir)/build-aux/missing +gnulib_repo=:pserver:anonymous@cvs.savannah.gnu.org:/sources/gnulib .PHONY: wget-update wget-update: $(get-targets) .PHONY: cvs-update cvs-update: - exit_status=0; \ - for f in $(cvs_files); do \ + fail=; \ + for f in $(cvs_files) dummy; do \ + test $$f = dummy && continue; \ test -f $$f || { echo "*** skipping $$f" 1>&2; continue; }; \ cvs diff $$f > /dev/null \ - || { exit_status=$$?; \ - echo "*** $$f is locally modified; skipping it" 1>&2; \ - continue; }; \ - file=$$(basename $$f); \ + || { echo "*** $$f is locally modified; skipping it" 1>&2; \ + fail=yes; continue; }; \ + file=$$(expr "X$$f" : 'X$(srcdir)/\(.*\)'); \ echo checking out $$file...; \ - $(CVS) -d $(automake_repo) co -p automake/lib/$$file> $$f.t \ - && $(move_if_change) $$f.t $$f || exit_status=$$?; \ + $(CVS) -d $(gnulib_repo) co -p gnulib/$$file >$$f.t \ + && $(move_if_change) $$f.t $$f; \ done; \ - exit $$exit_status + test "$$fail" && exit 1 emit_upload_commands: @echo ===================================== @echo ===================================== - @echo "$(srcdir)/gnupload $(GNUPLOADFLAGS) \\" + @echo "$(srcdir)/build-aux/gnupload $(GNUPLOADFLAGS) \\" @echo " --to $(gnu_rel_host):coreutils \\" @echo " $(rel-files)" @echo '# send the /tmp/announcement e-mail' @@ -609,7 +559,11 @@ $(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz xdelta delta -9 $^ $@ || : .PHONY: alpha beta major -alpha beta major: news-date-check $(local-check) +alpha beta major: news-date-check changelog-check $(local-check) + test $@ = major \ + && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \ + || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\ + || : $(MAKE) cvs-dist $(MAKE) $(xd-delta) $(MAKE) -s announcement RELEASE_TYPE=$@ > /tmp/announce-$(my_distdir) diff --git a/bin/autoconf.as b/bin/autoconf.as index c967c26c..83e76856 100644 --- a/bin/autoconf.as +++ b/bin/autoconf.as @@ -106,8 +106,8 @@ while test $# -gt 0 ; do autom4te_options="$autom4te_options '$1'"; shift ;; # Options with separated arg passed as is to autom4te. - --include | -I | \ - --prepend-include | -B | \ + --include | -I | \ + --prepend-include | -B | \ --warnings | -W ) test $# = 1 && eval "$exit_missing_arg" autom4te_options="$autom4te_options $option '$2'" diff --git a/config/config.guess b/build-aux/config.guess index 7924ac07..396482d6 100755 --- a/config/config.guess +++ b/build-aux/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-06-06' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -211,7 +211,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -790,10 +790,10 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) + x86:Interix*:[3456]*) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T:Interix*:[345]*) + EM64T:Interix*:[3456]*) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) diff --git a/config/config.sub b/build-aux/config.sub index 70584b00..53954dbe 100755 --- a/config/config.sub +++ b/build-aux/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-06-06' +timestamp='2006-08-14' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -284,7 +284,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -367,7 +367,7 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -909,6 +909,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1214,7 +1218,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/config/elisp-comp b/build-aux/elisp-comp index 2d1eb651..2d1eb651 100755 --- a/config/elisp-comp +++ b/build-aux/elisp-comp diff --git a/config/install-sh b/build-aux/install-sh index f746d0f8..9d6a5eb7 100755 --- a/config/install-sh +++ b/build-aux/install-sh @@ -39,8 +39,7 @@ scriptversion=2006-05-11.20 # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. +# from scratch. nl=' ' @@ -50,6 +49,11 @@ IFS=" "" $nl" # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -66,17 +70,9 @@ mkdirprog="${MKDIRPROG-mkdir}" posix_glob= posix_mkdir= -# Symbolic mode for testing mkdir with directories. -# It is the same as 755, but also tests that "u+" works. -test_mode=u=rwx,g=rx,o=rx,u+wx - # Desired mode of installed file. mode=0755 -# Desired mode of newly created intermediate directories. -# It is empty if not known yet. -intermediate_mode= - chmodcmd=$chmodprog chowncmd= chgrpcmd= @@ -133,6 +129,12 @@ while test $# -ne 0; do -m) mode=$2 shift shift + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac continue;; -o) chowncmd="$chownprog $2" @@ -191,7 +193,32 @@ if test $# -eq 0; then exit 0 fi -test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15 +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi for src do @@ -274,46 +301,67 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - posix_mkdir=false - if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then - posix_mkdir=true - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null - fi ;; - esac - - if - $posix_mkdir && { + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac # With -d, create the new directory with the user-specified mode. - # Otherwise, create it using the same intermediate mode that - # mkdir -p would use when creating intermediate directories. - # POSIX says that this mode is "$(umask -S),u+wx", so use that - # if umask -S works. - + # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then - mkdir_mode=$mode + mkdir_mode=-m$mode else - case $intermediate_mode in - '') - if umask_S=`(umask -S) 2>/dev/null`; then - intermediate_mode=$umask_S,u+wx - else - intermediate_mode=$test_mode - fi ;; - esac - mkdir_mode=$intermediate_mode + mkdir_mode= fi - $mkdirprog -m "$mkdir_mode" -p -- "$dstdir" - } + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- / "$tmpdir/d") >/dev/null 2>&1 + then + # Check for bugs in HP-UX 11.23 and IRIX 6.5 mkdir. + case `ls -ld "$tmpdir"` in + d????-??-* ) posix_mkdir=:;; + esac + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) then : else - # mkdir does not conform to POSIX, or it failed possibly due to - # a race condition. Create the directory the slow way, step by - # step, checking for races as we go. + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. case $dstdir in /*) prefix=/ ;; @@ -349,7 +397,8 @@ do prefixes= else if $posix_mkdir; then - $mkdirprog -m "$mkdir_mode" -p -- "$dstdir" && break + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 else @@ -365,7 +414,9 @@ do if test -n "$prefixes"; then # Don't fail if two instances are running concurrently. - eval "\$mkdirprog $prefixes" || test -d "$dstdir" || exit 1 + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 obsolete_mkdir_used=true fi fi @@ -375,7 +426,7 @@ do { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1 + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 else # Make a couple of temp file names in the proper directory. @@ -386,7 +437,7 @@ do trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -397,7 +448,7 @@ do { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } && + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && # Now rename the file to the real destination. { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ diff --git a/config/mdate-sh b/build-aux/mdate-sh index cd916c0a..cd916c0a 100644..100755 --- a/config/mdate-sh +++ b/build-aux/mdate-sh diff --git a/config/missing b/build-aux/missing index 1c8ff704..1c8ff704 100755 --- a/config/missing +++ b/build-aux/missing diff --git a/config/texinfo.tex b/build-aux/texinfo.tex index d41d4008..36c1acad 100644 --- a/config/texinfo.tex +++ b/build-aux/texinfo.tex @@ -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{2006-06-19.13} +\def\texinfoversion{2006-07-17.16} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free @@ -327,9 +327,9 @@ \pagebody{#1}% \ifdim\ht\footlinebox > 0pt % Only leave this space if the footline is nonempty. - % (We lessened \vsize for it in \oddfootingxxx.) + % (We lessened \vsize for it in \oddfootingyyy.) % The \baselineskip=24pt in plain's \makefootline has no effect. - \vskip 2\baselineskip + \vskip 24pt \unvbox\footlinebox \fi % @@ -2051,11 +2051,11 @@ where each line of input produces a line of output.} % and arrange explicitly to hyphenate at a dash. % -- rms. { - \catcode`\-=\active - \catcode`\_=\active + \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active % \global\def\code{\begingroup - \catcode`\-=\active \catcode`\_=\active + \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active + \let'\singlequotechar \ifallowcodebreaks \let-\codedash \let_\codeunder @@ -2472,8 +2472,8 @@ where each line of input produces a line of output.} % % Leave some space for the footline. Hopefully ok to assume % @evenfooting will not be used by itself. - \global\advance\pageheight by -\baselineskip - \global\advance\vsize by -\baselineskip + \global\advance\pageheight by -12pt + \global\advance\vsize by -12pt } \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} @@ -5042,7 +5042,7 @@ where each line of input produces a line of output.} {\tentt \global\dimen0 = 3em}% Width of the box. \dimen2 = .55pt % Thickness of rules % The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt} +\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} % \setbox\errorbox=\hbox to \dimen0{\hfil \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. @@ -5265,11 +5265,10 @@ where each line of input produces a line of output.} % \maketwodispenvs {lisp}{example}{% \nonfillstart - \tt + \tt\quoteexpand \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. \gobble % eat return } - % @display/@smalldisplay: same as @lisp except keep current font. % \makedispenv {display}{% @@ -5397,6 +5396,22 @@ where each line of input produces a line of output.} \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % \def\starttabbox{\setbox0=\hbox\bgroup} + +% Allow an option to not replace quotes with a regular directed right +% quote/apostrophe (char 0x27), but instead use the undirected quote +% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it +% the default, but it works for pasting with more pdf viewers (at least +% evince), the lilypond developers report. xpdf does work with the +% regular 0x27. +% +\def\singlequotechar{% + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else + \char'15 + \fi +} +% \begingroup \catcode`\^^I=\active \gdef\tabexpand{% @@ -5409,7 +5424,13 @@ where each line of input produces a line of output.} \wd0=\dimen0 \box0 \starttabbox }% } + \catcode`\'=\active + \gdef\quoteexpand{% + \catcode`\'=\active + \def'{\singlequotechar} + }% \endgroup +% \def\setupverbatim{% \let\nonarrowing = t% \nonfillstart @@ -5418,6 +5439,7 @@ where each line of input produces a line of output.} \def\par{\leavevmode\egroup\box0\endgraf}% \catcode`\`=\active \tabexpand + \quoteexpand % Respect line breaks, % print special symbols as themselves, and % make each space count diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files new file mode 100755 index 00000000..2fcc9473 --- /dev/null +++ b/build-aux/vc-list-files @@ -0,0 +1,59 @@ +#!/bin/sh +# List the specified version-controlled files. + +# Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + +# List the specified version-controlled files. +# With no argument, list them all. +# This script must be run solely from the top of a $srcdir build directory. + +# If there's an argument, it must be a single, "."-relative directory name, +# with no trailing slashes. In mercurial mode, it's used as part of a +# "grep" pattern (prepend "^", append "/"), and in cvs mode, it's simply +# used as an argument to the cvsu script. + +include_prefix= +case $# in + 0) ;; + 1) include_prefix=$1 ;; + *) echo "$0: too many arguments" 1>&2; exit 1 ;; +esac + +if test -d .git; then + if test "x$include_prefix" = x; then + git-ls-files | cut -d ' ' -f 3 + else + git-ls-files | cut -d ' ' -f 3 | grep "^$include_prefix/" + fi +elif test -d .hg; then + if test "x$include_prefix" = x; then + hg manifest | cut -d ' ' -f 3 + else + hg manifest | cut -d ' ' -f 3 | grep "^$include_prefix/" + fi +elif test -x build-aux/cvsu; then + build-aux/cvsu --find --types=AFGM $include_prefix +else + awk -F/ '{ \ + if (!$1 && $3 !~ /^-/) { \ + f=FILENAME; \ + sub(/CVS\/Entries/, "", f); \ + print f $2; \ + }}' \ + $(find ${*-*} -name Entries -print) /dev/null; +fi diff --git a/config/Makefile.am b/config/Makefile.am deleted file mode 100644 index ee6bfc95..00000000 --- a/config/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## Process this file with automake to create Makefile.in -*-Makefile-*- - -## Makefile for Autoconf. -## Copyright 2001, 2002 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., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. - -# This line added to force a rebuild of Makefile.in. - -EXTRA_DIST = $(SPECIFIC_MACROS) $(SPECIFIC_TOOLS) \ - prev-version.txt -MAINTAINERCLEANFILES = $(GENERIC_TOOLS) - -SPECIFIC_MACROS = \ -m4.m4 - -GENERIC_TOOLS = \ -config.guess \ -config.sub \ -emacs-comp \ -install-sh \ -mdate-sh \ -missing \ -mkinstalldirs \ -texinfo.tex - -SPECIFIC_TOOLS = move-if-change diff --git a/config/Makefile.in b/config/Makefile.in deleted file mode 100644 index 46796eec..00000000 --- a/config/Makefile.in +++ /dev/null @@ -1,295 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# This line added to force a rebuild of Makefile.in. -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = config -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \ - config.sub elisp-comp install-sh mdate-sh missing \ - mkinstalldirs texinfo.tex -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EMACS = @EMACS@ -EMACSLOADPATH = @EMACSLOADPATH@ -EXPR = @EXPR@ -GREP = @GREP@ -HELP2MAN = @HELP2MAN@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAKEINFO = @MAKEINFO@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TEST_EMACS = @TEST_EMACS@ -VERSION = @VERSION@ -ac_cv_sh_n_works = @ac_cv_sh_n_works@ -am__leading_dot = @am__leading_dot@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -lispdir = @lispdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -EXTRA_DIST = $(SPECIFIC_MACROS) $(SPECIFIC_TOOLS) \ - prev-version.txt - -MAINTAINERCLEANFILES = $(GENERIC_TOOLS) -SPECIFIC_MACROS = \ -m4.m4 - -GENERIC_TOOLS = \ -config.guess \ -config.sub \ -emacs-comp \ -install-sh \ -mdate-sh \ -missing \ -mkinstalldirs \ -texinfo.tex - -SPECIFIC_TOOLS = move-if-change -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu config/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# 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. -.NOEXPORT: diff --git a/config/announce-gen b/config/announce-gen index 1c133e97..e8e80b31 100755 --- a/config/announce-gen +++ b/config/announce-gen @@ -1,5 +1,22 @@ #!/usr/bin/perl -w # Generate an announcement message. + +# Copyright (C) 2002, 2003, 2004, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + use strict; use Getopt::Long; @@ -60,6 +77,7 @@ OPTIONS: --package-name=PACKAGE_NAME --previous-version=VER --current-version=VER + --gpg-key-id=ID The GnuPG ID of the key used to sign the tarballs --release-archive-directory=DIR --url-directory=URL_DIR --news=NEWS_FILE optional @@ -124,17 +142,17 @@ sub print_locations ($\@\%@) print "\n"; } -=item C<print_signatures (@file) +=item C<print_checksums (@file) Print the MD5 and SHA1 signature section for each C<@file>. =cut -sub print_signatures (@) +sub print_checksums (@) { my (@file) = @_; - print "Here are the MD5 and SHA1 signatures:\n"; + print "Here are the MD5 and SHA1 checksums:\n"; print "\n"; foreach my $meth (qw (md5 sha1)) @@ -178,7 +196,7 @@ sub print_news_deltas ($$$) or die "$ME: $news_file: cannot open for reading: $!\n"; while (defined (my $line = <NEWS>)) { - if (! $in_items) + if ( ! $in_items) { # Match lines like this one: # * Major changes in release 5.0.1: @@ -204,7 +222,6 @@ sub print_news_deltas ($$$) or die "$ME: $news_file: no matching lines for `$curr_version'\n"; } - sub print_changelog_deltas ($$) { my ($package_name, $prev_version) = @_; @@ -301,6 +318,7 @@ sub print_changelog_deltas ($$) my $prev_version; my $curr_version; my $release_archive_dir; + my $gpg_key_id; my @url_dir_list; my @news_file; @@ -310,6 +328,7 @@ sub print_changelog_deltas ($$) 'package-name=s' => \$package_name, 'previous-version=s' => \$prev_version, 'current-version=s' => \$curr_version, + 'gpg-key-id=s' => \$gpg_key_id, 'release-archive-directory=s' => \$release_archive_dir, 'url-directory=s' => \@url_dir_list, 'news=s' => \@news_file, @@ -366,10 +385,27 @@ EOF $tgz, $tbz); print_locations ("xdelta-style diffs", @url_dir_list, %size, $xd); - print_locations ("GPG detached signatures", @url_dir_list, %size, - "$tgz.asc", "$tbz.asc"); + print_locations ("GPG detached signatures[*]", @url_dir_list, %size, + "$tgz.sig", "$tbz.sig"); + + print_checksums ($tgz, $tbz, $xd); - print_signatures ($tgz, $tbz, $xd); + print <<EOF; + +[*] You can use either of the above signature files to verify that +the corresponding file (without the .sig suffix) is intact. First, +be sure to download both the .sig file and the corresponding tarball. +Then, run a command like this: + + gpg --verify $tgz.sig + +If that command fails because you don't have the required public key, +then run this command to import it: + + gpg --keyserver wwwkeys.pgp.net --recv-keys $gpg_key_id + +and rerun the \`gpg --verify' command. +EOF print_news_deltas ($_, $prev_version, $curr_version) foreach @news_file; diff --git a/config/mkinstalldirs b/config/mkinstalldirs deleted file mode 100755 index ef7e16fd..00000000 --- a/config/mkinstalldirs +++ /dev/null @@ -1,161 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2006-05-11.19 - -# Original author: Noah Friedman <friedman@prep.ai.mit.edu> -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to <bug-automake@gnu.org>." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/config/move-if-change b/config/move-if-change deleted file mode 100755 index ff74a556..00000000 --- a/config/move-if-change +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Like mv $1 $2, but if the files are the same, just delete $1. -# Status is zero if successful, nonzero otherwise. - -usage="$0: usage: $0 SOURCE DEST" - -case $# in -2) ;; -*) echo "$usage" >&2; exit 1;; -esac - -for arg in "$1" "$2"; do - case $arg in - -*) echo "$usage" >&2; exit 1;; - esac -done - -if test -r "$2" && cmp -s "$1" "$2"; then - rm -f "$1" -else - mv -f "$1" "$2" -fi diff --git a/configure.ac b/configure.ac index 10542c3d..2863a150 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,7 @@ AC_INIT([GNU Autoconf], [2.60a], [bug-autoconf@gnu.org]) AC_SUBST([PACKAGE_NAME])dnl AC_CONFIG_SRCDIR([ChangeLog]) -AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_FILES([config/Makefile]) +AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([check-news 1.7.9 dist-bzip2 readme-alpha]) diff --git a/lib/m4sugar/Makefile.am b/lib/m4sugar/Makefile.am index 75b5548a..08bb99e8 100644 --- a/lib/m4sugar/Makefile.am +++ b/lib/m4sugar/Makefile.am @@ -1,6 +1,6 @@ -## Process this file with automake to create Makefile.in +# Make Autoconf library for M4sugar. -## Copyright 2001, 2002 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2006 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 @@ -33,11 +33,11 @@ version.m4: $(top_srcdir)/configure.ac echo '# Copyright (C) 1999, 2000, 2001, 2002'; \ echo '# Free Software Foundation, Inc.'; \ echo ;\ - echo 'm4_define([m4_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ - echo 'm4_define([m4_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ - echo 'm4_define([m4_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ - echo 'm4_define([m4_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ - echo 'm4_define([m4_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ + echo 'm4_define([m4_PACKAGE_NAME], [$(PACKAGE_NAME)])'; \ + echo 'm4_define([m4_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])'; \ + echo 'm4_define([m4_PACKAGE_VERSION], [$(PACKAGE_VERSION)])'; \ + echo 'm4_define([m4_PACKAGE_STRING], [$(PACKAGE_STRING)])'; \ + echo 'm4_define([m4_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \ } >version.m4 @@ -1,4 +1,4 @@ -# Copyright 2000 Free Software Foundation, Inc. +# Copyright (C) 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 diff --git a/man/Makefile.am b/man/Makefile.am index e74355d3..067e12c3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,7 +1,6 @@ -## Process this file with automake to create Makefile.in -*-Makefile-*- +# Make Autoconf man pages. -## Makefile for Autoconf. -## Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. +## Copyright (C) 2001, 2004, 2005, 2006 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 @@ -44,8 +43,8 @@ $(srcdir)/autoupdate.1: $(common_dep) $(binsrcdir)/autoupdate.in $(srcdir)/ifnames.1: $(common_dep) $(binsrcdir)/ifnames.in # Independent from this package. -$(srcdir)/config.guess.1: $(top_srcdir)/config/config.guess -$(srcdir)/config.sub.1: $(top_srcdir)/config/config.sub +$(srcdir)/config.guess.1: $(top_srcdir)/build-aux/config.guess +$(srcdir)/config.sub.1: $(top_srcdir)/build-aux/config.sub remove_time_stamp = 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/' @@ -64,7 +63,7 @@ SUFFIXES = .x .1 done;; \ esac echo "Updating man page $@" - PATH="$(top_builddir)/tests@PATH_SEPARATOR@$(top_srcdir)/config@PATH_SEPARATOR@$$PATH"; \ + PATH="$(top_builddir)/tests$(PATH_SEPARATOR)$(top_srcdir)/build-aux$(PATH_SEPARATOR)$$PATH"; \ export PATH; \ $(HELP2MAN) \ --include=$*.x \ diff --git a/tests/Makefile.am b/tests/Makefile.am index a8708a9a..ca8f7eba 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,6 @@ -## Process this file with automake to create Makefile.in. -*-Makefile-*- +## Make Autoconf tests. -## Makefile for Autoconf testsuite. -## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -40,11 +39,11 @@ include ../lib/freeze.mk $(srcdir)/package.m4: $(top_srcdir)/configure.ac { \ echo '# Signature of the current package.'; \ - echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ - echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ - echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ - echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ - echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ + echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])'; \ + echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])'; \ + echo 'm4_define([AT_PACKAGE_VERSION], [$(PACKAGE_VERSION)])'; \ + echo 'm4_define([AT_PACKAGE_STRING], [$(PACKAGE_STRING)])'; \ + echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \ } >$(srcdir)/package.m4 @@ -174,7 +173,7 @@ maintainer-check: maintainer-check-posix maintainer-check-c++ CLEANFILES += expr expr: echo '#! $(SHELL)' >expr - echo 'result=`@EXPR@ "$$@"`' >>expr + echo 'result=`$(EXPR) "$$@"`'>>expr echo 'estatus=$$?' >>expr echo 'cat <<EOF' >>expr echo '$${result:-0}' >>expr diff --git a/tests/local.at b/tests/local.at index e753ab18..aae1d6eb 100644 --- a/tests/local.at +++ b/tests/local.at @@ -18,7 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -# We need a very up to date version of Autotest. m4_version_prereq([2.57]) # Used in many tests. @@ -194,7 +193,7 @@ ls -1 | sed '/^at-/d;/^state-/d;/^config\./d' | sort >state-ls.$][1 AT_DATA([configure.ac], [[AC_INIT -AC_CONFIG_AUX_DIR($top_srcdir/config) +AC_CONFIG_AUX_DIR($top_srcdir/build-aux) AC_CONFIG_HEADER(config.h:config.hin) AC_STATE_SAVE(before)] $1 diff --git a/tests/tools.at b/tests/tools.at index fb50b1d2..92eaa75a 100644 --- a/tests/tools.at +++ b/tests/tools.at @@ -56,9 +56,8 @@ AT_CHECK_SHELL_SYNTAX([$abs_top_builddir/tests/autoconf]) AT_CHECK_SHELL_SYNTAX([$abs_top_builddir/tests/testsuite]) # These are not built, they are in the src tree. -AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/config/install-sh]) -AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/config/mkinstalldirs]) -AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/config/missing]) +AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/build-aux/install-sh]) +AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/build-aux/missing]) AT_CLEANUP diff --git a/tests/torture.at b/tests/torture.at index 6bf56694..e4c6daf2 100644 --- a/tests/torture.at +++ b/tests/torture.at @@ -548,7 +548,7 @@ AT_DATA([Foo.in], [@foo@ AT_DATA([configure.ac], [[AC_INIT -AC_CONFIG_AUX_DIR($top_srcdir/config) +AC_CONFIG_AUX_DIR($top_srcdir/build-aux) AC_SUBST([foo], ]m4_for([n], 1, 100,, ....................)[) AC_CONFIG_FILES([Foo]) AC_OUTPUT @@ -619,7 +619,7 @@ AT_DATA([Foo.in], AT_DATA([configure.ac], [[AC_INIT -AC_CONFIG_AUX_DIR($top_srcdir/config) +AC_CONFIG_AUX_DIR($top_srcdir/build-aux) foo='one two' AC_SUBST([foo]) @@ -675,7 +675,7 @@ AT_DATA([configure.ac], [[AC_INIT d@&t@nl The following line silences the warnings, if uncommented: d@&t@nl AC_DEFUN([AC_DATAROOTDIR_CHECKED]) -AC_CONFIG_AUX_DIR($top_srcdir/config) +AC_CONFIG_AUX_DIR($top_srcdir/build-aux) # This substitution is wrong and bogus! Don't use it in your own code! # Read `info Autoconf "Defining Directories"'! |