OK to install?
The header.m4 patch is the most unreadable. For convenience here is
the past/present diff:
< AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
< ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
< <<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>,
<<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
< <<am_indx=1
< for am_file in <<$1>>; do
< case " <<$>>CONFIG_HEADERS " in
< *" <<$>>am_file "*<<)>>
< echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp
< -h$am_indx
< ;;
< esac
< am_indx=`expr "<<$>>am_indx" + 1`
< done<<>>dnl>>)
< changequote([,]))])
> AC_DEFUN([AM_CONFIG_HEADER],
> [AC_CONFIG_HEADER([$1])
> AC_OUTPUT_COMMANDS(
> [ifelse(patsubst([$1], [[^ ]], []),
> [],
> [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
> patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h])],
> [am_indx=1
> for am_file in $1; do
> case " $CONFIG_HEADERS " in
> *" $am_file "*)
> echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
> ;;
> esac
> am_indx=`expr "$am_indx" + 1`
> done])
Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.876
diff -u -r1.876 ChangeLog
--- ChangeLog 2000/07/28 17:11:10 1.876
+++ ChangeLog 2000/07/31 10:41:37
@@ -1,3 +1,13 @@
+2000-07-31 Akim Demaille <[EMAIL PROTECTED]>
+
+ * m4: Quote properly the name of the macros being defined.
+ Use `#' instead of `dnl' where appropriate.
+ * m4/header.m4 (AM_CONFIG_HEADER): Get rid of changequote, just
+ quote.
+ Don't quote passive characters.
+ Pull the AC_PREREQ outside the macro.
+ * m4/init.m4: Pull the AC_PREREQ outside the macro.
+
2000-07-28 Tom Tromey <[EMAIL PROTECTED]>
* lisp.am (uninstall-@DIR@LISP): Prefix file with $(DESTDIR).
Index: m4/ccstdc.m4
===================================================================
RCS file: /cvs/automake/automake/m4/ccstdc.m4,v
retrieving revision 1.7
diff -u -r1.7 ccstdc.m4
--- ccstdc.m4 1999/02/09 23:58:02 1.7
+++ ccstdc.m4 2000/07/31 10:41:38
@@ -20,7 +20,7 @@
# program @code{ansi2knr}, which comes with Ghostscript.
# @end defmac
-AC_DEFUN(AM_PROG_CC_STDC,
+AC_DEFUN([AM_PROG_CC_STDC],
[AC_REQUIRE([AC_PROG_CC])
AC_BEFORE([$0], [AC_C_INLINE])
AC_BEFORE([$0], [AC_C_CONST])
Index: m4/cond.m4
===================================================================
RCS file: /cvs/automake/automake/m4/cond.m4,v
retrieving revision 1.1
diff -u -r1.1 cond.m4
--- cond.m4 1997/04/28 05:59:43 1.1
+++ cond.m4 2000/07/31 10:41:38
@@ -1,6 +1,6 @@
# Define a conditional.
-AC_DEFUN(AM_CONDITIONAL,
+AC_DEFUN([AM_CONDITIONAL],
[AC_SUBST($1_TRUE)
AC_SUBST($1_FALSE)
if $2; then
Index: m4/depend.m4
===================================================================
RCS file: /cvs/automake/automake/m4/depend.m4,v
retrieving revision 1.2
diff -u -r1.2 depend.m4
--- depend.m4 1999/11/21 21:35:41 1.2
+++ depend.m4 2000/07/31 10:41:38
@@ -1,11 +1,11 @@
-dnl See how the compiler implements dependency checking.
-dnl Usage:
-dnl AM_DEPENDENCIES(NAME)
-dnl NAME is "CC", "CXX" or "OBJC".
+# See how the compiler implements dependency checking.
+# Usage:
+# AM_DEPENDENCIES(NAME)
+# NAME is "CC", "CXX" or "OBJC".
-dnl We try a few techniques and use that to set a single cache variable.
+# We try a few techniques and use that to set a single cache variable.
-AC_DEFUN(AM_DEPENDENCIES,[
+AC_DEFUN([AM_DEPENDENCIES],[
AC_REQUIRE([AM_SET_DEPDIR])
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])
ifelse([$1],CC,[
@@ -61,10 +61,10 @@
AC_SUBST([$1]DEPMODE)
])
-dnl Choose a directory name for dependency files.
-dnl This macro is AC_REQUIREd in AM_DEPENDENCIES
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in AM_DEPENDENCIES
-AC_DEFUN(AM_SET_DEPDIR,[
+AC_DEFUN([AM_SET_DEPDIR],[
if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
DEPDIR=.deps
else
@@ -73,7 +73,7 @@
AC_SUBST(DEPDIR)
])
-AC_DEFUN(AM_DEP_TRACK,[
+AC_DEFUN([AM_DEP_TRACK],[
AC_ARG_ENABLE(dependency-tracking,
[ --disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors])
Index: m4/depout.m4
===================================================================
RCS file: /cvs/automake/automake/m4/depout.m4,v
retrieving revision 1.4
diff -u -r1.4 depout.m4
--- depout.m4 1999/12/12 23:49:14 1.4
+++ depout.m4 2000/07/31 10:41:38
@@ -1,13 +1,13 @@
-dnl Generate code to set up dependency tracking.
-dnl This macro should only be invoked once -- use via AC_REQUIRE.
-dnl Usage:
-dnl AM_OUTPUT_DEPENDENCY_COMMANDS
+# Generate code to set up dependency tracking.
+# This macro should only be invoked once -- use via AC_REQUIRE.
+# Usage:
+# AM_OUTPUT_DEPENDENCY_COMMANDS
-dnl
-dnl This code is only required when automatic dependency tracking
-dnl is enabled. FIXME. This creates each `.P' file that we will
-dnl need in order to bootstrap the dependency handling code.
-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,[
+#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
AC_OUTPUT_COMMANDS([
test x"$AMDEP" != x"" ||
for mf in $CONFIG_FILES; do
Index: m4/dmalloc.m4
===================================================================
RCS file: /cvs/automake/automake/m4/dmalloc.m4,v
retrieving revision 1.3
diff -u -r1.3 dmalloc.m4
--- dmalloc.m4 1999/05/27 19:19:29 1.3
+++ dmalloc.m4 2000/07/31 10:41:38
@@ -5,7 +5,7 @@
# serial 1
-AC_DEFUN(AM_WITH_DMALLOC,
+AC_DEFUN([AM_WITH_DMALLOC],
[AC_MSG_CHECKING(if malloc debugging is wanted)
AC_ARG_WITH(dmalloc,
[ --with-dmalloc use dmalloc, as in
Index: m4/error.m4
===================================================================
RCS file: /cvs/automake/automake/m4/error.m4,v
retrieving revision 1.2
diff -u -r1.2 error.m4
--- error.m4 1999/03/11 22:56:12 1.2
+++ error.m4 2000/07/31 10:41:38
@@ -1,7 +1,7 @@
-dnl From Jim Meyering. Use this if you use the GNU error.[ch].
-dnl FIXME: Migrate into libit
+# From Jim Meyering. Use this if you use the GNU error.[ch].
+# FIXME: Migrate into libit
-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
+AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
[AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
am_cv_lib_error_at_line=yes,
Index: m4/gcj.m4
===================================================================
RCS file: /cvs/automake/automake/m4/gcj.m4,v
retrieving revision 1.3
diff -u -r1.3 gcj.m4
--- gcj.m4 1999/04/11 10:22:50 1.3
+++ gcj.m4 2000/07/31 10:41:38
@@ -1,7 +1,7 @@
-dnl Check for Java compiler.
-dnl For now we only handle the GNU compiler.
+# Check for Java compiler.
+# For now we only handle the GNU compiler.
-AC_DEFUN(AM_PROG_GCJ,[
+AC_DEFUN([AM_PROG_GCJ],[
AC_CHECK_PROGS(GCJ, gcj, gcj)
test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
if test "x${GCJFLAGS+set}" = xset; then
Index: m4/header.m4
===================================================================
RCS file: /cvs/automake/automake/m4/header.m4,v
retrieving revision 1.5
diff -u -r1.5 header.m4
--- header.m4 1997/04/25 18:31:56 1.5
+++ header.m4 2000/07/31 10:41:38
@@ -1,22 +1,27 @@
# Like AC_CONFIG_HEADER, but automatically create stamp file.
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated. We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>,
<<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
- case " <<$>>CONFIG_HEADERS " in
- *" <<$>>am_file "*<<)>>
- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e
's%[^/]*$%%'`stamp-h$am_indx
+# serial 2
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. We must strip everything past the first ":",
+# and everything past the last "/".
+
+AC_PREREQ([2.12])
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_CONFIG_HEADER([$1])
+AC_OUTPUT_COMMANDS(
+[ifelse(patsubst([$1], [[^ ]], []),
+ [],
+ [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
+ patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h])],
+[am_indx=1
+for am_file in $1; do
+ case " $CONFIG_HEADERS " in
+ *" $am_file "*)
+ echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
;;
esac
- am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
+ am_indx=`expr "$am_indx" + 1`
+done])
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.18
diff -u -r1.18 init.m4
--- init.m4 2000/05/01 10:57:08 1.18
+++ init.m4 2000/07/31 10:41:38
@@ -2,8 +2,10 @@
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
-# serial 2
+# serial 3
+AC_PREREQ([2.13])
+
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
# -----------------------------------------------------------
# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
@@ -20,9 +22,8 @@
# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
# ----------------------------------------------
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
[dnl We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
# test to see if srcdir already configured
if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
@@ -49,8 +50,8 @@
AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_MISSING_PROG(AMTAR, tar)
AM_MISSING_INSTALL_SH
-dnl We need awk for the "check" target. The system "awk" is bad on
-dnl some platforms.
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
Index: m4/lex.m4
===================================================================
RCS file: /cvs/automake/automake/m4/lex.m4,v
retrieving revision 1.3
diff -u -r1.3 lex.m4
--- lex.m4 1999/11/21 21:35:41 1.3
+++ lex.m4 2000/07/31 10:41:38
@@ -1,9 +1,9 @@
## Replacement for AC_PROG_LEX and AC_DECL_YYTEXT
## by Alexandre Oliva <[EMAIL PROTECTED]>
-dnl AM_PROG_LEX
-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN(AM_PROG_LEX,
+# AM_PROG_LEX
+# Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+AC_DEFUN([AM_PROG_LEX],
[AC_REQUIRE([AM_MISSING_HAS_RUN])
AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
AC_PROG_LEX
Index: m4/lispdir.m4
===================================================================
RCS file: /cvs/automake/automake/m4/lispdir.m4,v
retrieving revision 1.11
diff -u -r1.11 lispdir.m4
--- lispdir.m4 2000/01/13 00:58:57 1.11
+++ lispdir.m4 2000/07/31 10:41:38
@@ -6,7 +6,7 @@
# serial 3
-AC_DEFUN(AM_PATH_LISPDIR,
+AC_DEFUN([AM_PATH_LISPDIR],
[AC_ARG_WITH(lispdir,
[ --with-lispdir Override the default lisp directory ],
[ lispdir="$withval"
Index: m4/maintainer.m4
===================================================================
RCS file: /cvs/automake/automake/m4/maintainer.m4,v
retrieving revision 1.3
diff -u -r1.3 maintainer.m4
--- maintainer.m4 1998/10/03 18:26:55 1.3
+++ maintainer.m4 2000/07/31 10:41:38
@@ -3,7 +3,7 @@
# serial 1
-AC_DEFUN(AM_MAINTAINER_MODE,
+AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode,
Index: m4/minuso.m4
===================================================================
RCS file: /cvs/automake/automake/m4/minuso.m4,v
retrieving revision 1.1
diff -u -r1.1 minuso.m4
--- minuso.m4 1999/04/11 13:02:43 1.1
+++ minuso.m4 2000/07/31 10:41:38
@@ -1,9 +1,9 @@
-dnl Like AC_PROG_CC_C_O, but changed for automake.
+# Like AC_PROG_CC_C_O, but changed for automake.
AC_DEFUN([AM_PROG_CC_C_O],[
AC_REQUIRE([AC_PROG_CC_C_O])
-dnl FIXME: we rely on the cache variable name because
-dnl there is no other way.
+# FIXME: we rely on the cache variable name because
+# there is no other way.
set dummy $CC; ac_cc="`echo [$]2 |
changequote(, )dnl
sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
Index: m4/missing.m4
===================================================================
RCS file: /cvs/automake/automake/m4/missing.m4,v
retrieving revision 1.9
diff -u -r1.9 missing.m4
--- missing.m4 2000/03/13 10:40:49 1.9
+++ missing.m4 2000/07/31 10:41:38
@@ -1,15 +1,15 @@
## --------------------------------------------------------- ##
## Fake the existence of programs that GNU maintainers use. ##
## --------------------------------------------------------- ##
-dnl AM_MISSING_PROG(NAME, PROGRAM)
-AC_DEFUN(AM_MISSING_PROG, [
+# AM_MISSING_PROG(NAME, PROGRAM)
+AC_DEFUN([AM_MISSING_PROG], [
AC_REQUIRE([AM_MISSING_HAS_RUN])
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-dnl Like AM_MISSING_PROG, but only looks for install-sh.
-dnl AM_MISSING_INSTALL_SH()
-AC_DEFUN(AM_MISSING_INSTALL_SH, [
+# Like AM_MISSING_PROG, but only looks for install-sh.
+# AM_MISSING_INSTALL_SH()
+AC_DEFUN([AM_MISSING_INSTALL_SH], [
AC_REQUIRE([AM_MISSING_HAS_RUN])
if test -z "$install_sh"; then
install_sh="$ac_aux_dir/install-sh"
@@ -21,13 +21,13 @@
fi
AC_SUBST(install_sh)])
-dnl AM_MISSING_HAS_RUN.
-dnl Define MISSING if not defined so far and test if it supports --run.
-dnl If it does, set am_missing_run to use it, otherwise, to nothing.
+# AM_MISSING_HAS_RUN.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN], [
test x"${MISSING+set}" = xset || \
MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
-dnl Use eval to expand $SHELL
+# Use eval to expand $SHELL
if eval "$MISSING --run :"; then
am_missing_run="$MISSING --run "
else
Index: m4/multi.m4
===================================================================
RCS file: /cvs/automake/automake/m4/multi.m4,v
retrieving revision 1.2
diff -u -r1.2 multi.m4
--- multi.m4 1999/11/13 04:25:49 1.2
+++ multi.m4 2000/07/31 10:41:38
@@ -1,8 +1,8 @@
-dnl Add --enable-multilib to configure.
-dnl Usage: AM_ENABLE_MULTILIB([makefile, [rel-to-top-srcdir]])
+# Add --enable-multilib to configure.
+# Usage: AM_ENABLE_MULTILIB([makefile, [rel-to-top-srcdir]])
-AC_DEFUN(AM_ENABLE_MULTILIB, [
-dnl Default to --enable-multilib
+AC_DEFUN([AM_ENABLE_MULTILIB], [
+# Default to --enable-multilib
AC_ARG_ENABLE(multilib,
[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
@@ -11,8 +11,8 @@
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes]
-dnl We may get other options which we are undocumented:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
+# We may get other options which we are undocumented:
+# --with-target-subdir, --with-multisrctop, --with-multisubdir
if test "[$]{srcdir}" = "."; then
if test "[$]{with_target_subdir}" != "."; then
Index: m4/obstack.m4
===================================================================
RCS file: /cvs/automake/automake/m4/obstack.m4,v
retrieving revision 1.3
diff -u -r1.3 obstack.m4
--- obstack.m4 1999/03/11 22:56:14 1.3
+++ obstack.m4 2000/07/31 10:41:38
@@ -1,7 +1,7 @@
-dnl From Jim Meyering.
-dnl FIXME: migrate into libit.
+# From Jim Meyering.
+# FIXME: migrate into libit.
-AC_DEFUN(AM_FUNC_OBSTACK,
+AC_DEFUN([AM_FUNC_OBSTACK],
[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
[AC_TRY_LINK([#include "obstack.h"],
[struct obstack *mem;obstack_free(mem,(char *) 0)],
Index: m4/protos.m4
===================================================================
RCS file: /cvs/automake/automake/m4/protos.m4,v
retrieving revision 1.4
diff -u -r1.4 protos.m4
--- protos.m4 1998/10/09 11:10:20 1.4
+++ protos.m4 2000/07/31 10:41:38
@@ -5,7 +5,7 @@
# serial 1
-AC_DEFUN(AM_C_PROTOTYPES,
+AC_DEFUN([AM_C_PROTOTYPES],
[AC_REQUIRE([AM_PROG_CC_STDC])
AC_REQUIRE([AC_PROG_CPP])
AC_MSG_CHECKING([for function prototypes])
Index: m4/ptrdiff.m4
===================================================================
RCS file: /cvs/automake/automake/m4/ptrdiff.m4,v
retrieving revision 1.2
diff -u -r1.2 ptrdiff.m4
--- ptrdiff.m4 1998/10/09 11:10:21 1.2
+++ ptrdiff.m4 2000/07/31 10:41:38
@@ -2,7 +2,7 @@
# serial 1
-AC_DEFUN(AM_TYPE_PTRDIFF_T,
+AC_DEFUN([AM_TYPE_PTRDIFF_T],
[AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t,
[AC_TRY_COMPILE([#include <stddef.h>], [ptrdiff_t p],
am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)])
Index: m4/python.m4
===================================================================
RCS file: /cvs/automake/automake/m4/python.m4,v
retrieving revision 1.1
diff -u -r1.1 python.m4
--- python.m4 1999/11/22 19:22:02 1.1
+++ python.m4 2000/07/31 10:41:39
@@ -3,25 +3,25 @@
## From Andrew Dalke
## ------------------------
-dnl AM_PATH_PYTHON([package, module])
-dnl
+# AM_PATH_PYTHON([package, module])
+#
-dnl Adds support for distributing Python modules or the special form
-dnl of a module called a `package.' Modules of the first type are
-dnl files ending in `.py' with no '__init__.py' file. This must be
-dnl placed on the PYTHONPATH, and the default location is PYTHON_SITE,
-dnl or $(prefix)/lib/python$(PYTHON_VERSION)/site-package
-dnl
-dnl A package module is contained in its own directory. This directory
-dnl is named PACKAGE, which was the name given to automake. The full
-dnl directory path is PYTHON_SITE_PACKAGE or
-dnl $(prefix)/lib/python$(PYTHON_VERSION)/site-package/$(PACKAGE)
-dnl where site-package is on the PYTHONPATH. The `__init__.py' file is
-dnl located in the directory, along with any other submodules which may
-dnl be necessary.
+# Adds support for distributing Python modules or the special form
+# of a module called a `package.' Modules of the first type are
+# files ending in `.py' with no '__init__.py' file. This must be
+# placed on the PYTHONPATH, and the default location is PYTHON_SITE,
+# or $(prefix)/lib/python$(PYTHON_VERSION)/site-package
+#
+# A package module is contained in its own directory. This directory
+# is named PACKAGE, which was the name given to automake. The full
+# directory path is PYTHON_SITE_PACKAGE or
+# $(prefix)/lib/python$(PYTHON_VERSION)/site-package/$(PACKAGE)
+# where site-package is on the PYTHONPATH. The `__init__.py' file is
+# located in the directory, along with any other submodules which may
+# be necessary.
-AC_DEFUN(AM_PATH_PYTHON,
+AC_DEFUN([AM_PATH_PYTHON],
[
dnl Find a version of Python. I could check for python versions 1.4
dnl or earlier, but the default installation locations changed from
Index: m4/regex.m4
===================================================================
RCS file: /cvs/automake/automake/m4/regex.m4,v
retrieving revision 1.4
diff -u -r1.4 regex.m4
--- regex.m4 1999/03/11 22:56:15 1.4
+++ regex.m4 2000/07/31 10:41:39
@@ -14,7 +14,7 @@
# If found, the package will use the system's rx which, on Linux at least,
# will result in a smaller executable file.
-AC_DEFUN(AM_WITH_REGEX,
+AC_DEFUN([AM_WITH_REGEX],
[AC_MSG_CHECKING(which of GNU rx or gawk's regex is wanted)
AC_ARG_WITH(regex,
[ --without-regex use GNU rx in lieu of gawk's regex for matching],
Index: m4/sanity.m4
===================================================================
RCS file: /cvs/automake/automake/m4/sanity.m4,v
retrieving revision 1.8
diff -u -r1.8 sanity.m4
--- sanity.m4 1997/10/21 06:41:53 1.8
+++ sanity.m4 2000/07/31 10:41:39
@@ -2,7 +2,7 @@
# Check to make sure that the build environment is sane.
#
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
Index: m4/strtod.m4
===================================================================
RCS file: /cvs/automake/automake/m4/strtod.m4,v
retrieving revision 1.3
diff -u -r1.3 strtod.m4
--- strtod.m4 1999/03/11 22:56:16 1.3
+++ strtod.m4 2000/07/31 10:41:39
@@ -27,7 +27,7 @@
## variable @code{LIBOBJS}.
## @end defmac
-AC_DEFUN(AM_FUNC_STRTOD,
+AC_DEFUN([AM_FUNC_STRTOD],
[AC_CACHE_CHECK(for working strtod, am_cv_func_strtod,
[AC_TRY_RUN([
double strtod ();
Index: m4/termios.m4
===================================================================
RCS file: /cvs/automake/automake/m4/termios.m4,v
retrieving revision 1.1
diff -u -r1.1 termios.m4
--- termios.m4 1996/10/06 03:55:51 1.1
+++ termios.m4 2000/07/31 10:41:39
@@ -1,8 +1,8 @@
-dnl From Jim Meyering.
+# From Jim Meyering.
# serial 1
-AC_DEFUN(AM_SYS_POSIX_TERMIOS,
+AC_DEFUN([AM_SYS_POSIX_TERMIOS],
[AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios,
[AC_TRY_LINK([#include <sys/types.h>
#include <unistd.h>
Index: m4/winsz.m4
===================================================================
RCS file: /cvs/automake/automake/m4/winsz.m4,v
retrieving revision 1.2
diff -u -r1.2 winsz.m4
--- winsz.m4 1998/10/09 11:10:23 1.2
+++ winsz.m4 2000/07/31 10:41:39
@@ -1,8 +1,8 @@
-dnl From Jim Meyering.
+# From Jim Meyering.
# serial 1
-AC_DEFUN(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL,
+AC_DEFUN([AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
[AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
am_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
Index: tests/ChangeLog
===================================================================
RCS file: /cvs/automake/automake/tests/ChangeLog,v
retrieving revision 1.295
diff -u -r1.295 ChangeLog
--- ChangeLog 2000/05/01 21:03:23 1.295
+++ ChangeLog 2000/07/31 10:41:47
@@ -1,3 +1,8 @@
+2000-07-31 Akim Demaille <[EMAIL PROTECTED]>
+
+ * depacl.test: Weaken the regexp looking for AM_PROG_CC_C_STDC in
+ aclocal.m4.
+
2000-05-01 Pavel Roskin <[EMAIL PROTECTED]>
* install2.test: Prevent automake from looking into .. and ../..
@@ -1283,4 +1288,3 @@
* mdate.test, vtexi.test, acoutput.test: New files.
* Started.
-
Index: tests/depacl.test
===================================================================
RCS file: /cvs/automake/automake/tests/depacl.test,v
retrieving revision 1.1
diff -u -r1.1 depacl.test
--- depacl.test 1996/07/28 17:54:08 1.1
+++ depacl.test 2000/07/31 10:41:47
@@ -10,4 +10,4 @@
$ACLOCAL || exit 1
-grep '^AC_DEFUN.AM_PROG_CC_STDC,$' aclocal.m4
+grep '^AC_DEFUN.*AM_PROG_CC_STDC' aclocal.m4
