From f3a651c5ca753fd02d3491f961185a906a6f4b27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Sep 2009 23:16:59 +0200 Subject: Temporarily disable several gnulib QA checks to avoid failures. Gnulib performs a number of useful QA checks before assembling a release tarball. Some of those checks fail, however, and fixing the macro content to conform is a bit of an effort. I'll re-enable those tests one by one in the foreseeable future. --- bootstrap.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 95d2a4e..9d7c596 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -9,7 +9,13 @@ else fi $gnulibtool --m4-base build-aux --source-base build-aux --import git-version-gen gitlog-to-changelog gnupload maintainer-makefile announce-gen -sed -i -e 's/^sc_file_system:/disabled_sc_file_system:/' maint.mk +sed -i -e 's/^sc_file_system:/disabled_sc_file_system:/' \ + -e 's/^sc_GPL_version:/disabled_sc_GPL_version:/' \ + -e 's/^sc_m4_quote_check:/disabled_sc_m4_quote_check:/' \ + -e 's/^sc_prohibit_strcmp:/disabled_sc_prohibit_strcmp:/' \ + -e 's/^sc_space_tab:/disabled_sc_space_tab:/' \ + -e 's/^sc_useless_cpp_parens:/disabled_sc_useless_cpp_parens:/' \ + maint.mk echo TODO >AUTHORS -- cgit v1.2.1 From dfd472ac7244c454a2f7f5c3fbdb085eaaea85f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Sep 2009 23:17:16 +0200 Subject: AX_AM_MACROS_STATIC: drop trailing whitespace --- m4/ax_am_macros_static.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/ax_am_macros_static.m4 b/m4/ax_am_macros_static.m4 index e5a8830..cb36d51 100644 --- a/m4/ax_am_macros_static.m4 +++ b/m4/ax_am_macros_static.m4 @@ -29,7 +29,7 @@ AC_DEFUN([AMINCLUDE_STATIC],[aminclude_static.am]) AC_DEFUN([AX_AM_MACROS_STATIC], [ AX_AC_PRINT_TO_FILE(AMINCLUDE_STATIC,[ -# ]AMINCLUDE_STATIC[ generated automatically by Autoconf +# ]AMINCLUDE_STATIC[ generated automatically by Autoconf # from AX_AM_MACROS_STATIC on ]m4_esyscmd([date])[ ]) ]) -- cgit v1.2.1 From 7721f05378775c4771c42dc6e1e18f62f406ee1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Sep 2009 23:18:09 +0200 Subject: AX_CHECK_ALLOCATED_CTIME: don't cast char* to void* when calling free(2) The cast is redundant and gnulib complains about it, too. --- m4/ax_check_allocated_ctime.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/ax_check_allocated_ctime.m4 b/m4/ax_check_allocated_ctime.m4 index 5995d1c..d693efa 100644 --- a/m4/ax_check_allocated_ctime.m4 +++ b/m4/ax_check_allocated_ctime.m4 @@ -26,7 +26,7 @@ AC_DEFUN([AX_CHECK_ALLOCATED_CTIME],[ int main (int argc, char** argv) { time_t timeVal = time( (time_t*)NULL ); char* pzTime = ctime( &timeVal ); - free( (void*)pzTime ); + free( pzTime ); return 0; }],[ax_cv_allocated_ctime=yes],[ax_cv_allocated_ctime=no],[ax_cv_allocated_ctime=no] ) # end of TRY_RUN]) # end of CACHE_VAL -- cgit v1.2.1 From d56bcca6b53234e3a07b3aa0b8a0780254e3f032 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Sep 2009 23:19:21 +0200 Subject: Fixed trivial typos. --- m4/ax_dist_rpm.m4 | 2 +- m4/ax_var_timezone_externals.m4 | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/m4/ax_dist_rpm.m4 b/m4/ax_dist_rpm.m4 index 5a9d341..5bb862a 100644 --- a/m4/ax_dist_rpm.m4 +++ b/m4/ax_dist_rpm.m4 @@ -83,7 +83,7 @@ if test "x$AX_HAVE_INSTALL_FILES" = "xtrue"; then AC_CHECK_PROGS(RPM,[rpmbuild rpm echo]) fi if test "x$RPM" != "x"; then - AC_ARG_VAR(PLATFORM_SUFFIX, [A short name for your platform that will be added to the name of the the binary RPMs you may choose to create (by running make rpm). e.g. rh71 for RedHat 7.1, lsb1.3 for a LSB 1.3 compliant system (SuSE 8.2 or RedHat 9), osx103 for OS X 10.3.x, etc]) + AC_ARG_VAR(PLATFORM_SUFFIX, [A short name for your platform that will be added to the name of the binary RPMs you may choose to create (by running make rpm). e.g. rh71 for RedHat 7.1, lsb1.3 for a LSB 1.3 compliant system (SuSE 8.2 or RedHat 9), osx103 for OS X 10.3.x, etc]) AC_MSG_CHECKING([rpm platform suffix]) if test "x$PLATFORM_SUFFIX" != "x"; then AC_MSG_RESULT([$PLATFORM_SUFFIX]) diff --git a/m4/ax_var_timezone_externals.m4 b/m4/ax_var_timezone_externals.m4 index 49fabb6..f345d91 100644 --- a/m4/ax_var_timezone_externals.m4 +++ b/m4/ax_var_timezone_externals.m4 @@ -8,11 +8,10 @@ # # DESCRIPTION # -# Use instead of `AC_STRUCT_TIMEZONE' to determine whether the the -# external timezone variables `timezone', `altzone' and `daylight' exist, -# defining `HAVE_TIMEZONE', `HAVE_ALTZONE' and `HAVE_DAYLIGHT' -# respectively (as well as gaining the macros defined by -# `AC_STRUCT_TIMEZONE'). +# Use instead of `AC_STRUCT_TIMEZONE' to determine whether the external +# timezone variables `timezone', `altzone' and `daylight' exist, defining +# `HAVE_TIMEZONE', `HAVE_ALTZONE' and `HAVE_DAYLIGHT' respectively (as +# well as gaining the macros defined by `AC_STRUCT_TIMEZONE'). # # LICENSE # -- cgit v1.2.1 From 1bb4774cd4be401ef65995c585a94be87a07820f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Sep 2009 23:48:03 +0200 Subject: Revert ".prev-version: Delete this file. There was no previous release." This reverts commit 659842a6f3c9734815c9dcb48781dc96fa3bef76. Gnulib's release mechanism doesn't work if this file is absent. For the first release, the generated announcement mail will be wrong, because the "previous release" denoted in here actually doesn't exist -- so it will have to be edited appropriately before sending it out --, but after the first proper release, this file will have the right contents. --- .prev-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .prev-version diff --git a/.prev-version b/.prev-version new file mode 100644 index 0000000..63546be --- /dev/null +++ b/.prev-version @@ -0,0 +1 @@ +2009.07.20 -- cgit v1.2.1 From bf7e9ffefbe59d0a0027467533097213e74321cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2009 00:12:42 +0200 Subject: bootstrap.sh: warn maintainers if the html tree is not present Without it, ./configure won't work correctly because of the following code: HTMLFILE="" for n in ${srcdir}/html/*.* ; do HTMLFILE="${HTMLFILE} ${n}" done AC_SUBST([HTMLFILE]) Arguably, this behavior is unsatisfactory, but I can't think of an ad hoc solution that's better. --- TODO | 7 +++++++ bootstrap.sh | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/TODO b/TODO index c42e778..d1283c3 100644 --- a/TODO +++ b/TODO @@ -71,3 +71,10 @@ avoid that error. * TODO Link to http://www.flameeyes.eu/autotools-mythbuster/ + +* TODO Don't use shell globs to configure the list of available macros + + The [[configure.ac][configure]] script globs m4/*.m4 to determine the list of available macros. + This mechanism is pretty fragile. Since the exact list is known at the time + we compile the release archive, that information should be inserted in the + script statically. But how? diff --git a/bootstrap.sh b/bootstrap.sh index 9d7c596..c3f8b46 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -22,3 +22,9 @@ echo TODO >AUTHORS build-aux/gitlog-to-changelog -- master >ChangeLog autoreconf --install -Wall + +if [ ! -d html ]; then + echo "" + echo " Remember to check out the HTML tree before running configure." + echo "" +fi -- cgit v1.2.1 From 2e897dbf329762f500eb40093b3175fbba7c11d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2009 00:13:06 +0200 Subject: TODO: updated several entries --- TODO | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index d1283c3..778ccc1 100644 --- a/TODO +++ b/TODO @@ -26,12 +26,12 @@ The file should contain the people who committed to Git and the people who are listed in m4 file copyright lines. -* TODO Improve submission guide lines on the web site - * TODO VL_PROG_CC_WARNINGS and AX_CFLAGS_WARN* overlap. Contact the authors and ask whether they'd like to help re-factor the code. +* TODO Improve submission guide lines on the web site + ** New submissions should use an AX_ prefix. Other prefixes are fine, too, but use of AX_ inside of the Autoconf Archive @@ -64,12 +64,22 @@ Some macros feature http or mailto URIs. The generator scripts should recognize those and generate appropriate hyperlinks output (where feasible). -* TODO Figure out how to disable sc_file_system check in maint.mk +* TODO Figure out how to disable sc_file_system check in maint.mk [0/4] Gnulib wants us to use spelling "file system" and objects when it sees the name ax_boost_filesystem in autoconf-archive.texi. There ought to be a way to avoid that error. + Progress: The [[bootstrap.sh]] script disable those checks that don't work well + for this project. In order to get on, though, some meaningful tests were + disable, too. We should re-enable those and fix the macro contents to comply + with those rules: + + * [ ] sc_m4_quote_check + * [ ] sc_prohibit_strcmp + * [ ] sc_space_tab + * [ ] sc_useless_cpp_parens + * TODO Link to http://www.flameeyes.eu/autotools-mythbuster/ * TODO Don't use shell globs to configure the list of available macros -- cgit v1.2.1 From fe53369c3a71093306fdf132e2f622f36b97fdb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2009 00:45:10 +0200 Subject: AX_PROG_PERL_MODULES: cosmetic in the documentation, no functional changes --- m4/ax_prog_perl_modules.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/ax_prog_perl_modules.m4 b/m4/ax_prog_perl_modules.m4 index 057cc60..394ae4d 100644 --- a/m4/ax_prog_perl_modules.m4 +++ b/m4/ax_prog_perl_modules.m4 @@ -15,8 +15,8 @@ # will be run. # # MODULES is a space separated list of module names. To check for a -# minimum version of a module, append the version number to the -# module name, separated by an equals sign. +# minimum version of a module, append the version number to the module +# name, separated by an equals sign. # # Example: # -- cgit v1.2.1 From 6d8c4e34059ec356831c32b4fb9905a797e7d8fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2009 00:53:36 +0200 Subject: Integrated Texinfo documentation into the Automake build. --- .gitignore | 3 +++ Makefile.am | 6 +++++- autoconf-archive.texi | 4 ++-- cfg.mk | 21 ++++++++------------- configure.ac | 14 +++++++++++--- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 5f3fe03..90f617a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,8 @@ /config.log /config.status /configure +/doc/* /gnulib /maint.mk +/stamp-vti +/version.texi diff --git a/Makefile.am b/Makefile.am index ca7f018..7751cf0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,11 @@ dist_aclocal_DATA = $(M4SOURCE) htmldir = $(pkgdatadir)/html dist_html_DATA = $(HTMLFILE) -EXTRA_DIST = build-aux/git-version-gen +info_TEXINFOS = autoconf-archive.texi + +EXTRA_DIST = build-aux/git-version-gen $(TEXIFILE) + +autoconf-archive.info: $(TEXIFILE) # maintainer rules diff --git a/autoconf-archive.texi b/autoconf-archive.texi index 939eb62..1a7167c 100644 --- a/autoconf-archive.texi +++ b/autoconf-archive.texi @@ -7,7 +7,7 @@ @end ifclear @comment %**end of header -@include stage/version.texi +@include version.texi @copying This manual is for Autoconf Archive @value{VERSION}, @@ -581,6 +581,6 @@ General Public License for more details. * ax_xtra_classpath:: @end menu -@include stage/all-macros.texi +@include doc/all-macros.texi @bye diff --git a/cfg.mk b/cfg.mk index 66f878a..5e8e369 100644 --- a/cfg.mk +++ b/cfg.mk @@ -14,11 +14,12 @@ TAR_OPTIONS += --mtime=$(today) M4DIR := $(srcdir)/m4 HTMLDIR := $(srcdir)/html STAGEDIR := $(srcdir)/stage +DOCDIR := $(srcdir)/doc M4_FILES := $(wildcard $(M4DIR)/*.m4) MACROS := $(patsubst $(M4DIR)/%.m4,%, $(M4_FILES)) HTML_FILES := $(patsubst %,$(HTMLDIR)/%.html,$(MACROS)) -TEXI_FILES := $(patsubst %,$(STAGEDIR)/%.texi,$(MACROS)) +TEXI_FILES := $(patsubst %,$(DOCDIR)/%.texi,$(MACROS)) .PHONY: generate ALL_RECURSIVE_TARGETS += generate @@ -38,24 +39,18 @@ $(STAGEDIR)/%.html : $(STAGEDIR)/%.m4 $(srcdir)/macro2html.py @echo generating $@ @$(srcdir)/macro2html.py "$<" "$@" -$(STAGEDIR)/%.texi : $(STAGEDIR)/%.m4 $(srcdir)/macro2texi.py +$(DOCDIR)/%.texi : $(STAGEDIR)/%.m4 $(srcdir)/macro2texi.py $(DOCDIR)/all-macros.texi @echo generating $@ @$(srcdir)/macro2texi.py "$<" "$@" -$(HTMLDIR)/%.html : $(STAGEDIR)/%.html - @echo pretty-printing $@ - @tidy -quiet -ascii --indent yes --indent-spaces 1 --tidy-mark no -wrap 80 --hide-comments yes "$<" >"$@" - -$(STAGEDIR)/all-macros.texi: $(TEXI_FILES) - @$(MKDIR_P) $(STAGEDIR) +$(DOCDIR)/all-macros.texi: + @$(MKDIR_P) $(DOCDIR) @rm -f "$@" @for n in $(TEXI_FILES); do echo "@include $$n" >>"$@"; done -$(STAGEDIR)/autoconf-archive.info: $(srcdir)/autoconf-archive.texi $(STAGEDIR)/all-macros.texi $(STAGEDIR)/version.texi - makeinfo -o $@ $< - -$(STAGEDIR)/version.texi: - echo @set VERSION $(VERSION) >"$@" +$(HTMLDIR)/%.html : $(STAGEDIR)/%.html + @echo pretty-printing $@ + @tidy -quiet -ascii --indent yes --indent-spaces 1 --tidy-mark no -wrap 80 --hide-comments yes "$<" >"$@" taint-distcheck: diff --git a/configure.ac b/configure.ac index 0b43b7a..ebedc49 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl configure the Autoconf Archive AC_INIT([autoconf-archive], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [autoconf-archive-maintainers@nongnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall gnu dist-bzip2 dist-xz]) -AC_CONFIG_SRCDIR([m4/ax_have_epoll.m4]) +AC_CONFIG_SRCDIR([autoconf-archive.texi]) AC_COPYRIGHT([dnl Compilation Copyright 2009 by Peter Simons @@ -27,14 +27,22 @@ done AC_SUBST([M4SOURCE]) AC_MSG_RESULT([done]) -AC_MSG_CHECKING([for available documentation]) +AC_MSG_CHECKING([for available HTML documentation]) HTMLFILE="" -for n in ${srcdir}/html/*.* ; do +for n in ${srcdir}/html/*.html ${srcdir}/html/*.css ; do HTMLFILE="${HTMLFILE} ${n}" done AC_SUBST([HTMLFILE]) AC_MSG_RESULT([done]) +AC_MSG_CHECKING([for available Texinfo documentation]) +TEXIFILE="" +for n in ${srcdir}/doc/*.texi ; do + TEXIFILE="${TEXIFILE} ${n}" +done +AC_SUBST([TEXIFILE]) +AC_MSG_RESULT([done]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- cgit v1.2.1 From a336c4891d0201f531ee48af130df3bfb105a7d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2009 01:26:25 +0200 Subject: configure.ac: brought copyright line in sync with the one in the texinfo documentation Eventually, the copyright will be transferred to the FSF. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ebedc49..9112d95 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall gnu dist-bzip2 dist-xz]) AC_CONFIG_SRCDIR([autoconf-archive.texi]) AC_COPYRIGHT([dnl -Compilation Copyright 2009 by Peter Simons +Compilation Copyright 2001-2009 by Peter Simons This compilation is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as -- cgit v1.2.1 From 374be76dcb55b717b26a45e91bebd46f338dd860 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2009 01:26:50 +0200 Subject: cfg.mk: dropped obsolete taint-distcheck and my-distcheck targets --- cfg.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index 5e8e369..fbcd57c 100644 --- a/cfg.mk +++ b/cfg.mk @@ -51,7 +51,3 @@ $(DOCDIR)/all-macros.texi: $(HTMLDIR)/%.html : $(STAGEDIR)/%.html @echo pretty-printing $@ @tidy -quiet -ascii --indent yes --indent-spaces 1 --tidy-mark no -wrap 80 --hide-comments yes "$<" >"$@" - -taint-distcheck: - -my-distcheck: -- cgit v1.2.1 From d680d8ed79037c2dc00b693ee593a0da02529308 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2009 01:29:12 +0200 Subject: bootstrap.sh: generate a ChangeLog only for the macro contents Users typically aren't interested in the meta files like Makefile.am etc., and if they are, the complete history is publicly available in git. TODO: This really ought to be done by automake. --- TODO | 6 ++++++ bootstrap.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 778ccc1..025f9d4 100644 --- a/TODO +++ b/TODO @@ -88,3 +88,9 @@ This mechanism is pretty fragile. Since the exact list is known at the time we compile the release archive, that information should be inserted in the script statically. But how? + +* TODO Integrate generation of the ChangeLog file into the build system + + Currently, [[bootstrap.sh]] generates that file, but this mechanism doesn't + ensure that the file is up-to-date come at the time a release archive is + compiled. diff --git a/bootstrap.sh b/bootstrap.sh index c3f8b46..0b3d025 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -19,7 +19,7 @@ sed -i -e 's/^sc_file_system:/disabled_sc_file_system:/' \ echo TODO >AUTHORS -build-aux/gitlog-to-changelog -- master >ChangeLog +build-aux/gitlog-to-changelog >ChangeLog -- master m4/ autoreconf --install -Wall -- cgit v1.2.1 From 92d4b0359d6fa12a6ee41056e879dd4087cc6d8d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2009 01:29:41 +0200 Subject: maintainer-clean: clean the COPYING file, it's installed by automake --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7751cf0..1e6ea08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,4 +30,4 @@ maintainer-clean-local: @rm -rf $(srcdir)/build-aux @rm -f configure Makefile.in aclocal.m4 AUTHORS ChangeLog @rm -f INSTALL config.log config.status configure maint.mk - @rm -f autoconf-archive-*.*.*.tar.* GNUmakefile + @rm -f autoconf-archive-*.*.*.tar.* GNUmakefile COPYING -- cgit v1.2.1