Use the new 3-arg form of AC_DEFINE instead of my gross kludge.

diff --git a/m4/realloc.m4 b/m4/realloc.m4
index aba1984064f0c056523321703624bcd3109e0cdc..5166ad4df212425efb9ae17236ebb77642d9b0a7 100644 (file)
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 dnl From Jim Meyering.
 dnl Determine whether realloc works when both arguments are 0.
@@ -12,16 +12,10 @@ dnl
 
 AC_DEFUN(jm_FUNC_REALLOC,
 [
- if test x = y; then
-   dnl This code is deliberately never run via ./configure.
-   dnl FIXME: this is a gross hack to make autoheader put an entry
-   dnl for this symbol in config.h.in.
-   AC_CHECK_FUNCS(DONE_WORKING_REALLOC_CHECK)
- fi
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken realloc -- as it might if this test were omitted.
- ac_kludge=HAVE_DONE_WORKING_REALLOC_CHECK
- AC_DEFINE_UNQUOTED($ac_kludge)
+ AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
+                    [Define if the realloc check has been performed. ])
 
  AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
   [AC_TRY_RUN([

diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4
index 823f9ed018b90c8466a92e540dcf6fa01ba97955..625ea94aa3cfb396e6c402e3801de4cbe923085f 100644 (file)
--- a/m4/st_dm_mode.m4
+++ b/m4/st_dm_mode.m4
@@ -1,3 +1,5 @@
+#serial 2
+
 # Define HAVE_ST_DM_MODE if struct stat has an st_dm_mode member.
 
 AC_DEFUN(AC_STRUCT_ST_DM_MODE,
@@ -8,18 +10,8 @@ AC_DEFUN(AC_STRUCT_ST_DM_MODE,
      ac_cv_struct_st_dm_mode=no)])
 
   if test $ac_cv_struct_st_dm_mode = yes; then
-    if test x = y; then
-      # This code is deliberately never run via ./configure.
-      # FIXME: this is a hack to make autoheader put the corresponding
-      # HAVE_* undef for this symbol in config.h.in.  This saves me the
-      # trouble of having to add the #undef in acconfig.h manually.
-      AC_CHECK_FUNCS(ST_DM_MODE)
-    fi
-    # Defining it this way (rather than via AC_DEFINE) short-circuits the
-    # autoheader check -- autoheader doesn't know it's already been taken
-    # care of by the hack above.
-    ac_kludge=HAVE_ST_DM_MODE
-    AC_DEFINE_UNQUOTED($ac_kludge)
+    AC_DEFINE_UNQUOTED(HAVE_ST_DM_MODE, 1,
+                      [Define if struct stat has an st_dm_mode member. ])
   fi
  ]
 )

diff --git a/m4/stat.m4 b/m4/stat.m4
index c232df9a328aa2c268729515fc5f5a2f907063b6..767b9a5d7bf1c779f77ec61fc7fe1509d27eba9b 100644 (file)
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
 
 dnl From Jim Meyering.
 dnl Determine whether stat has the bug that it succeeds when given the
@@ -30,22 +30,10 @@ AC_DEFUN(jm_FUNC_STAT,
         jm_cv_func_stat_empty_string_bug=yes)
   ])
   if test $jm_cv_func_stat_empty_string_bug = yes; then
-
     LIBOBJS="$LIBOBJS stat.o"
-
-    if test $jm_cv_func_stat_empty_string_bug = yes; then
-      if test x = y; then
-       # This code is deliberately never run via ./configure.
-       # FIXME: this is a hack to make autoheader put the corresponding
-       # HAVE_* undef for this symbol in config.h.in.  This saves me the
-       # trouble of having to maintain the #undef in acconfig.h manually.
-       AC_CHECK_FUNCS(STAT_EMPTY_STRING_BUG)
-      fi
-      # Defining it this way (rather than via AC_DEFINE) short-circuits the
-      # autoheader check -- autoheader doesn't know it's already been taken
-      # care of by the hack above.
-      ac_kludge=HAVE_STAT_EMPTY_STRING_BUG
-      AC_DEFINE_UNQUOTED($ac_kludge)
-    fi
+    AC_DEFINE_UNQUOTED(HAVE_STAT_EMPTY_STRING_BUG, 1,
+[Define if stat has the bug that it succeeds when given the zero-length
+   file name argument.  The stat from SunOS4.1.4 and the Hurd as of 1998-11-01)
+   do this. ])
   fi
 ])