Autoconf 2.5x related changes

7 files changed, 14 insertions, 14 deletions

diff --git a/m4/decl.m4 b/m4/decl.m4
index 4dd7e0d6..7d20e38b 100644
--- a/m4/decl.m4
+++ b/m4/decl.m4
@@ -32,6 +32,6 @@ AC_DEFUN(jm_CHECK_DECLARATIONS,
     jm_CHECK_DECLARATION($jm_func, [$1],
     [
       jm_tr_func=HAVE_DECL_`echo $jm_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
-      AC_DEFINE_UNQUOTED($jm_tr_func) $3], [$4])dnl
+      AC_DEFINE_UNQUOTED($jm_tr_func, 1, [Define if your system declares $1]) $3], [$4])dnl
   done
 ])
diff --git a/m4/dosfile.m4 b/m4/dosfile.m4
index 48184cf0..5616eea4 100644
--- a/m4/dosfile.m4
+++ b/m4/dosfile.m4
@@ -14,7 +14,7 @@ AC_DEFUN(AC_DOSFILE,
     ])
 
   if test $ac_cv_dosfile = yes; then
-    AC_DEFINE(HAVE_DOS_FILE_NAMES)
+    AC_DEFINE(HAVE_DOS_FILE_NAMES, 1, [Define if your OS uses backslashes as directory separators])
     AC_DEFINE(HAVE_DOS_FILE_CONTENTS, 1,
       [Define if text file lines end in CRLF.])
   fi
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 8a9484d3..5c63480e 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -21,7 +21,7 @@ AC_DEFUN(AM_WITH_NLS,
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+      AC_DEFINE(ENABLE_NLS, 1, [Define if you want to use NLS support])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -61,7 +61,7 @@ AC_DEFUN(AM_WITH_NLS,
 
 	   if test "$gt_cv_func_gettext_libc" = "yes" \
 	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
+	      AC_DEFINE(HAVE_GETTEXT, 1, [Define if you have gettext])
 	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
 	      if test "$MSGFMT" != "no"; then
@@ -91,7 +91,7 @@ AC_DEFUN(AM_WITH_NLS,
 	    dnl No gettext in C library.  Try catgets next.
 	    AC_CHECK_LIB(i, main)
 	    AC_CHECK_FUNC(catgets,
-	      [AC_DEFINE(HAVE_CATGETS)
+	      [AC_DEFINE(HAVE_CATGETS, 1, [Define if you have catgets])
 	       INTLOBJS="\$(CATOBJS)"
 	       AC_PATH_PROG(GENCAT, gencat, no)dnl
 	       if test "$GENCAT" != "no"; then
@@ -224,7 +224,7 @@ strdup __argz_count __argz_stringify __argz_next])
      AC_CHECK_FUNCS(stpcpy)
    fi
    if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY)
+     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
    fi
 
    AM_LC_MESSAGES
diff --git a/m4/init.m4 b/m4/init.m4
index c91a2fb6..b923b955 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", [Package name])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version]))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
diff --git a/m4/install.m4 b/m4/install.m4
index 78b04921..b0c3feac 100644
--- a/m4/install.m4
+++ b/m4/install.m4
@@ -6,7 +6,7 @@
 
 # serial 1
 
-AC_DEFUN(AM_PROG_INSTALL,
+AC_DEFUN([AM_PROG_INSTALL],
 [AC_REQUIRE([AC_PROG_INSTALL])
 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 AC_SUBST(INSTALL_SCRIPT)dnl
diff --git a/m4/largefile.m4 b/m4/largefile.m4
index 10b9c488..85019083 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -9,7 +9,7 @@ dnl Written by Paul Eggert <eggert@twinsun.com>.
 
 dnl Internal subroutine of AC_SYS_LARGEFILE.
 dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
-AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
+AC_DEFUN([AC_SYS_LARGEFILE_FLAGS],
   [AC_CACHE_CHECK([for $1 value to request large file support],
      ac_cv_sys_largefile_$1,
      [if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2
@@ -46,7 +46,7 @@ changequote([, ])dnl
 
 dnl Internal subroutine of AC_SYS_LARGEFILE.
 dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)
-AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
+AC_DEFUN([AC_SYS_LARGEFILE_SPACE_APPEND],
   [case $2 in
    no) ;;
    ?*)
@@ -58,7 +58,7 @@ AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
 
 dnl Internal subroutine of AC_SYS_LARGEFILE.
 dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+AC_DEFUN([AC_SYS_LARGEFILE_MACRO_VALUE],
   [AC_CACHE_CHECK([for $1], $2,
      [$2=no
 changequote(, )dnl
@@ -77,7 +77,7 @@ changequote([, ])dnl
      AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
    fi])
 
-AC_DEFUN(AC_SYS_LARGEFILE,
+AC_DEFUN([AC_SYS_LARGEFILE],
   [AC_REQUIRE([AC_CANONICAL_HOST])
    AC_ARG_ENABLE(largefile,
      [  --disable-largefile     omit support for large files])
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index e31bb533..b8b8bb77 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -14,6 +14,6 @@ AC_DEFUN(AM_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
     if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
+      AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if you have LC_MESSAGES])
     fi
   fi])