* m4/depend.m4 (AM_DEP_TRACK): Use `AS_HELP_STRING' to format
the help message added to the generated configure.
* m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
* m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
* m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
* m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
* tests/help-depend.test: Updated.
* tests/help-depend2.test: Likewise.
* tests/help-maintainer.test: Likewise.
Also, bumped all serial numbers of the modified m4 files.
---
ChangeLog | 14 ++
m4/depend.m4 | 13 +
m4/dmalloc.m4 |7 ---
m4/lispdir.m4 |5 +++--
m4/maintainer.m4 | 11 ++-
m4/multi.m4|8 +---
tests/help-depend.test |4 ++--
tests/help-depend2.test|4 ++--
tests/help-maintainer.test |9 ++---
9 files changed, 51 insertions(+), 24 deletions(-)
From 34768f5b7c55169d36d29cc9ead1010a5047e129 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini stefano.lattar...@gmail.com
Date: Sun, 12 Dec 2010 14:17:41 +0100
Subject: [PATCH] More uses of AS_HELP_STRING in automake macros.
* m4/depend.m4 (AM_DEP_TRACK): Use `AS_HELP_STRING' to format
the help message added to the generated configure.
* m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
* m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
* m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
* m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
* tests/help-depend.test: Updated.
* tests/help-depend2.test: Likewise.
* tests/help-maintainer.test: Likewise.
Also, bumped all serial numbers of the modified m4 files.
---
ChangeLog | 14 ++
m4/depend.m4 | 13 +
m4/dmalloc.m4 |7 ---
m4/lispdir.m4 |5 +++--
m4/maintainer.m4 | 11 ++-
m4/multi.m4|8 +---
tests/help-depend.test |4 ++--
tests/help-depend2.test|4 ++--
tests/help-maintainer.test |9 ++---
9 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 20da64d..308b378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-12 Stefano Lattarini stefano.lattar...@gmail.com
+
+ More uses of AS_HELP_STRING in automake macros.
+ * m4/depend.m4 (AM_DEP_TRACK): Use `AS_HELP_STRING' to format
+ the help message added to the generated configure.
+ * m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
+ * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
+ * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
+ * m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
+ * tests/help-depend.test: Updated.
+ * tests/help-depend2.test: Likewise.
+ * tests/help-maintainer.test: Likewise.
+ Also, bumped all serial numbers of the modified m4 files.
+
2010-12-07 Stefano Lattarini stefano.lattar...@gmail.com
Make tests `colon*.test' more semantic.
diff --git a/m4/depend.m4 b/m4/depend.m4
index 652c4c0..aa43d8e 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -6,7 +6,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 11
+# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -169,9 +169,14 @@ AC_SUBST([DEPDIR], [${am__leading_dot}deps])dnl
# AM_DEP_TRACK
#
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])dnl
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])dnl
+])
if test x$enable_dependency_tracking != xno; then
am_depcomp=$ac_aux_dir/depcomp
AMDEPBACKSLASH='\'
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index aea5f9d..5d48a24 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -10,12 +10,13 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
AC_DEFUN([AM_WITH_DMALLOC],
[AC_MSG_CHECKING([if malloc debugging is wanted])
-AC_ARG_WITH(dmalloc,
-[ --with-dmalloc use dmalloc, as in http://www.dmalloc.com],
+AC_ARG_WITH([dmalloc],
+[AS_HELP_STRING([--with-dmalloc],
+[use dmalloc, as in http://www.dmalloc.com])],
[if test $withval = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_DMALLOC,1,
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 62c2daf..bc1c831 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -10,7 +10,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 11
# AM_PATH_LISPDIR
# ---
@@ -23,7 +23,8 @@
