* m4/winsz.m4 (AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Use

	3-argument form of AC_DEFINE.
	* m4/regex.m4 (AM_WITH_REGEX): Use 3-argument form of AC_DEFINE.
	* m4/ptrdiff.m4 (AM_TYPE_PTRDIFF_T): Use 3-argument form of
	AC_DEFINE.
	* m4/protos.m4 (AM_C_PROTOTYPES):Use 3-argument form of
	AC_DEFINE.
	* m4/obstack.m4 (AM_FUNC_OBSTACK): Use 3-argument form of
	AC_DEFINE.
	* m4/init.m4 (AM_INIT_AUTOMAKE): Use 3-argument form of
	AC_DEFINE.
	* m4/dmalloc.m4 (AM_WITH_DMALLOC): Use 3-argument form of
	AC_DEFINE.

7 files changed, 10 insertions, 8 deletions

diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index 365ef8039..e1e3cdb17 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -12,7 +12,8 @@ AC_ARG_WITH(dmalloc,
                           ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz],
 [if test "$withval" = yes; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(WITH_DMALLOC)
+  AC_DEFINE(WITH_DMALLOC,1,
+            [Define if using the dmalloc debugging malloc package])
   LIBS="$LIBS -ldmalloc"
   LDFLAGS="$LDFLAGS -g"
 else
diff --git a/m4/init.m4 b/m4/init.m4
index c91a2fb67..9bfdd148c 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -18,8 +18,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
diff --git a/m4/obstack.m4 b/m4/obstack.m4
index b702aee43..df6fcba62 100644
--- a/m4/obstack.m4
+++ b/m4/obstack.m4
@@ -8,7 +8,7 @@ AC_DEFUN(AM_FUNC_OBSTACK,
 	      am_cv_func_obstack=yes,
 	      am_cv_func_obstack=no)])
  if test $am_cv_func_obstack = yes; then
-   AC_DEFINE(HAVE_OBSTACK)
+   AC_DEFINE(HAVE_OBSTACK,1,[Define if libc includes obstacks])
  else
    LIBOBJS="$LIBOBJS obstack.o"
  fi
diff --git a/m4/protos.m4 b/m4/protos.m4
index b148d0623..0079f74d3 100644
--- a/m4/protos.m4
+++ b/m4/protos.m4
@@ -11,7 +11,7 @@ AC_REQUIRE([AC_PROG_CPP])
 AC_MSG_CHECKING([for function prototypes])
 if test "$am_cv_prog_cc_stdc" != no; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(PROTOTYPES)
+  AC_DEFINE(PROTOTYPES,1,[Define if compiler has function prototypes])
   U= ANSI2KNR=
 else
   AC_MSG_RESULT(no)
diff --git a/m4/ptrdiff.m4 b/m4/ptrdiff.m4
index 85bf4aceb..9818ddfca 100644
--- a/m4/ptrdiff.m4
+++ b/m4/ptrdiff.m4
@@ -7,6 +7,6 @@ AC_DEFUN(AM_TYPE_PTRDIFF_T,
      [AC_TRY_COMPILE([#include <stddef.h>], [ptrdiff_t p],
 		     am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)])
    if test $am_cv_type_ptrdiff_t = yes; then
-     AC_DEFINE(HAVE_PTRDIFF_T)
+     AC_DEFINE(HAVE_PTRDIFF_T,1,[Define if system has ptrdiff_t type])
    fi
 ])
diff --git a/m4/regex.m4 b/m4/regex.m4
index 007b16636..309102ea3 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -22,7 +22,7 @@ AC_ARG_WITH(regex,
 [am_with_regex=1])
 if test -n "$am_with_regex"; then
   AC_MSG_RESULT(regex)
-  AC_DEFINE(WITH_REGEX)
+  AC_DEFINE(WITH_REGEX,1,[Define if using GNU regex])
   AC_CACHE_CHECK([for GNU regex in libc], am_cv_gnu_regex,
     AC_TRY_LINK([], [extern int re_max_failures; re_max_failures = 1],
 		am_cv_gnu_regex=yes, am_cv_gnu_regex=no))
diff --git a/m4/winsz.m4 b/m4/winsz.m4
index 163e512bd..fa81c9d77 100644
--- a/m4/winsz.m4
+++ b/m4/winsz.m4
@@ -30,6 +30,7 @@ AC_DEFUN(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL,
   fi
   ])
   if test $am_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
-    AC_DEFINE(GWINSZ_IN_SYS_IOCTL)
+    AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1,
+              [Define if TIOCGWINSZ requires sys/ioctl.h])
   fi
 ])