[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
/floppy/m4-patches/15-fyi-automake-and-autotest.patch
|
From: |
Akim Demaille |
|
Subject: |
/floppy/m4-patches/15-fyi-automake-and-autotest.patch |
|
Date: |
Mon, 27 Aug 2001 09:28:42 +0200 |
This patch is much longer than I expected because of problems with
Automake. I thought I could first update Autotest then Automake, but
having only 1.5 on my system, there was no hope.
Also, for the nth time I discovered we were not shipping all the
macros we need, e.g., error.m4. So I moved to the futuristic scheme I
want the Autotools to use, meaning the end of aclocal.m4 as a mere
concatenation of the *.m4 files, now it's only a list of m4_include's.
That allows me to ship the Automake et Gettext macros for real instead
of having them in aclocal.m4, what resulted in my not being able to
work on M4 at home because as soon as I touched some m4 files, aclocal
ran, and killed the gettext macros that were shipped, replacing them
with those of my system, obsolete.
Now, with this system, this cannot happen again. We simply never
trust the system's macros, unless the maintainer says so, of course.
Index: ChangeLog
from Akim Demaille <address@hidden>
* Makefile.am (AUTOMAKE_OPTIONS): 1.5.
Don't use aclocal: it's written by hand.
* aclocal.m4: m4_include all the files instead of being built by
aclocal.
* bootstrap: Help automake find the AC_SUBSTs and AM_CONDITIONALs
until it reads the traces by itself.
* configure.in: Require Autoconf 2.42c as we are now using
AC_CONFIG_TESTDIR instead of AT_CONFIG.
Catch unexpanded `jm_' macros.
* config/atconfig.m4: Remove.
* config/error.m4: new.
* config/Makefile.am: Ship the files included by aclocal.m4.
* tests/Makefile.am (TESTSUITE_SOURCES): Rename as...
(TESTSUITE_AT): this, to please Automake.
(TESTSUITE): This target uses autotest/autotest.m4, not
autotest/general.m4.
* tests/testsuite.at: Prereq Autotest 2.52c.
* examples/Makefile.am (pkgdata_DATA): Rename as...
(dist_pkgdata_DATA): this.
* doc/Makefile.am (man_MANS): Rename as...
(dist_man_mans): this.
Index: Makefile.am
--- Makefile.am Wed, 15 Aug 2001 18:31:50 +0200 akim
+++ Makefile.am Fri, 24 Aug 2001 15:20:30 +0200 akim
@@ -19,13 +19,14 @@
##
## Written by Gary V. Vaughan <address@hidden>
-AUTOMAKE_OPTIONS = 1.4
+AUTOMAKE_OPTIONS = 1.5
EXTRA_DIST = bootstrap
auxdir = $(top_srcdir)/$(ac_aux_dir)
-ACLOCAL_AMFLAGS = -I $(auxdir)
+## There is currently no means with Automake not to run aclocal.
+ACLOCAL_AMFLAGS = --version >/dev/null && touch aclocal.m4
SUBDIRS = intl po config m4 modules src tests examples
doc .
MAINTAINERCLEANFILES = ABOUT-NLS COPYING INSTALL Makefile.in aclocal.m4 \
Index: bootstrap
--- bootstrap Wed, 15 Aug 2001 18:31:50 +0200 akim
+++ bootstrap Fri, 24 Aug 2001 16:00:16 +0200 akim
@@ -7,7 +7,26 @@
rm -f config.cache
-aclocal -I ./$auxdir || exit 1
+# Make a copy of each Automake/Gettext m4 file we need.
+aclocal_libdir=`aclocal --print-ac-dir`
+for i in `make -f config/Makefile.am list-standard-macros`
+do
+ cp $aclocal_libdir/$i config ||
+ echo "$0: cannot find $i" >&2
+done
+
+# Automake understands nothing to our aclocal and misses all its
+# AC_SUBST...
+(
+ set -e
+ sed -n '1,/# Help Automake understand includes./p' aclocal.m4
+ echo "# It doesn't see AC_SUBSTs."
+ autoconf -t AC_SUBST:'AC_SUBST([$1])' | sort -u
+ echo "# It doesn't see AM_CONDITIONALs."
+ autoconf -t AM_CONDITIONAL:'AM_CONDITIONAL([$1])' | sort -u
+) >aclocal.m4t
+mv aclocal.m4t aclocal.m4
+
# shtoolize -q -I ./$auxdir echo move install mkdir version || exit 1
# libtoolize -f -c || exit 1
# gettextize -f -c || exit 1
Index: configure.in
--- configure.in Sun, 19 Aug 2001 23:00:40 +0200 akim
+++ configure.in Fri, 24 Aug 2001 15:50:34 +0200 akim
@@ -16,14 +16,19 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA
-AC_PREREQ(2.52)
+# We need a modern Autotest.
+AC_PREREQ([2.52c])
m4_pattern_allow([^m4_cv_])
+# We use some of Jim's macros.
+m4_pattern_forbid([^jm_])
+m4_pattern_allow([^jm_cv_])
+
AC_INIT([GNU M4], [1.4q], address@hidden)
AC_CONFIG_SRCDIR([src/m4.h])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h:config-h.in)
-AT_CONFIG(tests)
+AC_CONFIG_TESTDIR(tests)
AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
Index: config/Makefile.am
--- config/Makefile.am Sun, 19 Aug 2001 23:00:40 +0200 akim
+++ config/Makefile.am Fri, 24 Aug 2001 16:59:03 +0200 akim
@@ -21,18 +21,52 @@
MAINTAINERCLEANFILES = \
Makefile.in \
+ltmain.sh \
+texinfo.tex \
+$(STANDARD_MACROS) \
+$(STANDARD_TOOLS)
+
+STANDARD_MACROS = \
+auxdir.m4 \
+ccstdc.m4 \
+codeset.m4 \
+cond.m4 \
+depend.m4 \
+depout.m4 \
+dmalloc.m4 \
+gettext.m4 \
+glibc21.m4 \
+header.m4 \
+iconv.m4 \
+init.m4 \
+install-sh.m4 \
+isc-posix.m4 \
+lcmessage.m4 \
+make.m4 \
+missing.m4 \
+progtest.m4 \
+protos.m4 \
+sanity.m4 \
+strip.m4
+
+STANDARD_TOOLS = \
+compile \
config.guess \
config.sub \
+depcomp \
install-sh \
-ltmain.sh \
mdate-sh \
missing \
-mkinstalldirs \
-texinfo.tex
+mkinstalldirs
-EXTRA_DIST = \
-atconfig.m4 \
+SPECIFIC_MACROS = \
debug.m4 \
+error.m4 \
gmp.m4 \
gnu-obstack.m4 \
stackovf.m4
+
+list-standard-macros:
+ @echo $(STANDARD_MACROS)
+
+EXTRA_DIST = $(SPECIFIC_MACROS) $(STANDARD_MACROS)
Index: config/missing
--- config/missing Wed, 15 Aug 2001 18:31:50 +0200 akim
+++ config/missing Fri, 24 Aug 2001 15:30:15 +0200 akim
@@ -1,7 +1,7 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <address@hidden>, 1996.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <address@hidden>, 1996.
# 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
@@ -18,11 +18,37 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
case "$1" in
-h|--h|--he|--hel|--help)
@@ -35,6 +61,7 @@
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
@@ -43,13 +70,15 @@ Options:
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing 0.3 - GNU automake"
;;
-*)
@@ -61,7 +90,7 @@ Options:
aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`configure.in'. You might want
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@@ -70,7 +99,7 @@ WARNING: \`$1' is missing on your system
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`configure.in'. You might want to install the
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@@ -79,10 +108,10 @@ WARNING: \`$1' is missing on your system
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`configure.in'. You might want
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -98,7 +127,7 @@ WARNING: \`$1' is missing on your system
automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -159,7 +188,32 @@ WARNING: \`$1' is missing on your system
fi
;;
+ help2man)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
+ ;;
+
makeinfo)
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+ # We have makeinfo, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -173,6 +227,45 @@ WARNING: \`$1' is missing on your system
file=`sed -n '/address@hidden/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
fi
touch $file
+ ;;
+
+ tar)
+ shift
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar ${1+"$@"} && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar ${1+"$@"} && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case "$firstarg" in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" ${1+"$@"} && exit 0
+ ;;
+ esac
+ case "$firstarg" in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" ${1+"$@"} && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
;;
*)
Index: doc/Makefile.am
--- doc/Makefile.am Thu, 16 Aug 2001 13:02:57 +0200 akim
+++ doc/Makefile.am Fri, 24 Aug 2001 16:54:28 +0200 akim
@@ -18,9 +18,9 @@
info_TEXINFOS = m4.texinfo
-man_MANS = m4.1
+dist_man_MANS = m4.1
-EXTRA_DIST = helptoman.pl # $(MANS)
+EXTRA_DIST = helptoman.pl
# Automake 1.4 does not support TAGS_FILES directly.
TAGS_FILES = $(info_TEXINFOS)
Index: m4/Makefile.am
--- m4/Makefile.am Sat, 18 Aug 2001 10:08:06 +0200 akim
+++ m4/Makefile.am Fri, 24 Aug 2001 17:02:04 +0200 akim
@@ -18,6 +18,7 @@
## Boston, MA 02111-1307, USA.
CLEANFILES = pathconf.h
+DISTCLEANFILES = obstack.h
MAINTAINERCLEANFILES = Makefile.in
MODULE_PATH = $(pkglibexecdir)
Index: modules/Makefile.am
--- modules/Makefile.am Thu, 16 Aug 2001 12:39:25 +0200 akim
+++ modules/Makefile.am Fri, 24 Aug 2001 16:50:16 +0200 akim
@@ -18,6 +18,7 @@
##
## Written by Gary V. Vaughan <address@hidden>
+DISTCLEANFILES = perlxsi.c
MAINTAINERCLEANFILES = Makefile.in
testsubdir = testSubDir
@@ -70,9 +71,6 @@
time_la_SOURCES = time.c
time_la_LDFLAGS = -module
+BUILT_SOURCES = perlxsi.c
perlxsi.c:
perl -MExtUtils::Embed -e xsinit -- -o perlxsi.c
-
-perl.lo: perl.c perlxsi.c
- @echo '$(LTCOMPILE) $(perl_la_CFLAGS) -c $<'; \
- $(LTCOMPILE) $(perl_la_CFLAGS) -c $<
Index: examples/Makefile.am
--- examples/Makefile.am Fri, 10 Aug 2001 14:01:13 +0200 akim
+++ examples/Makefile.am Fri, 24 Aug 2001 16:56:12 +0200 akim
@@ -1,22 +1,22 @@
## This file is part of GNU m4
## Copyright 2000 Free Software Foundation, Inc.
-##
+##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 2 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
-##
+##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
## 02111-1307 USA
-EXTRA_DIST = $(pkgdata_DATA) mktests.sh $(WEB_SITE)
+EXTRA_DIST = mktests.sh $(WEB_SITE)
MAINTAINERCLEANFILES = Makefile.in
@@ -47,8 +47,8 @@
WWW/m4lib/uses.m4 \
WWW/m4lib/visions.m4 \
WWW/m4lib/whatis.m4
-
-pkgdata_DATA = \
+
+dist_pkgdata_DATA = \
capitalize.m4 \
comments.m4 \
ddivert.m4 \
@@ -74,5 +74,3 @@
undivert.incl \
undivert.m4 \
wrap.m4
-
-all:
Index: tests/Makefile.am
--- tests/Makefile.am Sun, 19 Aug 2001 23:00:40 +0200 akim
+++ tests/Makefile.am Fri, 24 Aug 2001 17:01:14 +0200 akim
@@ -20,7 +20,7 @@
# Ty Coon, President of Vice
EXTRA_DIST = generate.awk atlocal.in \
- $(OTHER_FILES) $(TESTSUITE_SOURCES) $(TESTSUITE)
+ $(OTHER_FILES) $(TESTSUITE_AT) $(TESTSUITE)
MAINTAINERCLEANFILES = Makefile.in generated.at $(TESTSUITE)
@@ -28,7 +28,7 @@
iso8859.m4 incl.m4 foo \
stackovf.test
-TESTSUITE_SOURCES = testsuite.at others.at generated.at
+TESTSUITE_AT = testsuite.at others.at generated.at
TESTSUITE = testsuite
check-local: atconfig $(TESTSUITE)
@@ -42,8 +42,11 @@ check-local: atconfig $(TESTSUITE)
# FIXME: Autom4te is not complete yet, and lacks a means to find
# the lib files.
AUTOM4TE = autom4te
-AUTOTEST = $(AUTOM4TE) -I /usr/local/share/autoconf autotest/general.m4
-$(srcdir)/$(TESTSUITE): $(TESTSUITE_SOURCES)
+AUTOTEST = $(AUTOM4TE) -I /usr/local/share/autoconf autotest/autotest.m4
+$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
$(AUTOTEST) -I $(srcdir) testsuite.at -o address@hidden
chmod +x address@hidden
mv address@hidden $@
+
+# Junk created by the testsuite.
+CLEANFILES = at-* atconfig atlocal frozen.m4f testsuite.log
Index: tests/others.at
--- tests/others.at Sun, 19 Aug 2001 23:00:40 +0200 akim
+++ tests/others.at Fri, 24 Aug 2001 17:01:05 +0200 akim
@@ -615,7 +615,7 @@ m4: ../examples/include.m4: 6: Cannot op
AT_CHECK_M4([-R frozen.m4f unfrozen.m4], 0,
[expout], [experr])
-AT_CLEANUP
+AT_CLEANUP([frozen.m4f])
Index: tests/testsuite.at
--- tests/testsuite.at Sun, 19 Aug 2001 23:00:40 +0200 akim
+++ tests/testsuite.at Fri, 24 Aug 2001 16:04:59 +0200 akim
@@ -18,6 +18,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
+# We need a recent Autotest.
+m4_version_prereq([2.52c])
+
# AT_CHECK_M4(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)
# -----------------------------------------------------
# Hide the impact of libtool on program_invocation_name, and hide
Index: config/error.m4
--- 0.22/config/error.m4 Fri, 24 Aug 2001 17:07:12 +0200 akim ()
+++ config/error.m4 Fri, 24 Aug 2001 15:47:02 +0200 akim
@@ -0,0 +1,11 @@
+#serial 2
+
+dnl FIXME: put these prerequisite-only *.m4 files in a separate
+dnl directory -- otherwise, they'll conflict with existing files.
+
+dnl These are the prerequisite macros for GNU's error.c file.
+AC_DEFUN([jm_PREREQ_ERROR],
+[
+ AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
+ AC_HEADER_STDC
+])
Index: config/atconfig.m4
--- config/atconfig.m4 Sun, 19 Aug 2001 23:00:40 +0200 akim
+++ 0.22(w)/config/atconfig.m4 Fri, 24 Aug 2001 17:07:12 +0200 akim ()
@@ -1,74 +0,0 @@
-## ----------------------## -*- Autoconf -*-
-## Prepare for testing. ##
-## ----------------------##
-
-#serial 6
-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-
-# AT_CONFIG(TEST-DIRECTORY, [AUTOTEST-PATH = .])
-# ----------------------------------------------
-# Configure the test suite.
-#
-# AUTOTEST-PATH must help the test suite to find the executables,
-# i.e., if the executables are in `src/', pass `src'. If there are
-# also executables in the source tree, use `src:$top_srcdir/src'.
-
-AC_DEFUN([AT_CONFIG],
-[AC_CONFIG_COMMANDS([$1/atconfig],
-[cat >$1/atconfig <<EOF
address@hidden:@ Configurable variable values for building test suites.
address@hidden:@ Generated by $[0]
address@hidden:@ Copyright 2000, 2001 Free Software Foundation, Inc.
-
-at_package='$at_package'
-at_version='$at_version'
-at_bugreport='$at_bugreport'
-
-at_n='$at_n'
-at_c='$at_c'
-
-at_testdir='$1'
-at_topbuild_2_topsrc='$at_topbuild_2_topsrc'
-
-AUTOTEST_PATH='m4_default([$2], [.])'
-
-SHELL=\${CONFIG_SHELL-'$at_shell'}
-PATH_SEPARATOR='$at_path_separator'
-
-EOF
-],
-[at_package='$PACKAGE_NAME'
-at_version='$PACKAGE_VERSION'
-at_bugreport='$PACKAGE_BUGREPORT'
-
-at_n='$ECHO_N'
-at_c='$ECHO_C'
-
-# Path from top_build to top_src
-at_topbuild_2_topsrc=$srcdir
-
-at_shell='$SHELL'
-at_path_separator='$PATH_SEPARATOR'
-])
-
-if test -f $srcdir/$1/atlocal.in; then
- AC_CONFIG_FILES([$1/atlocal])
-fi
-])# AT_CONFIG
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- /floppy/m4-patches/15-fyi-automake-and-autotest.patch,
Akim Demaille <=