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

diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index 87569f8d36927fbf418f9aeadb52904b70f9d4be..70abc12b38a8a11ec6e49c7f8c7699b66e54f24f 100644 (file)
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2

 
 dnl From Jim Meyering.
 dnl
 
 dnl From Jim Meyering.
 dnl


@@ -25,18 +25,8 @@ AC_DEFUN(jm_FSTYPENAME,
     )
 
     if test $fu_cv_sys_f_fstypename_in_statfs = yes; then
     )
 
     if test $fu_cv_sys_f_fstypename_in_statfs = 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(F_FSTYPENAME_IN_STATFS)
-      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_F_FSTYPENAME_IN_STATFS
-      AC_DEFINE_UNQUOTED($ac_kludge)
+      AC_DEFINE_UNQUOTED(HAVE_F_FSTYPENAME_IN_STATFS, 1,
+                        [Define if struct statfs has the f_fstypename member.])

     fi
   ]
 )
     fi
   ]
 )

diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index 4ccd7ce4dc36a7e5b09df6782619fd8099431be7..750639d6fd9bb88cbfb3b88736780693a9913f81 100644 (file)
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3

 
 dnl From Paul Eggert.
 
 
 dnl From Paul Eggert.
 


@@ -7,12 +7,6 @@ dnl From Paul Eggert.
 
 AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
 [
 
 AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
 [

-  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 `HAVE_INTTYPES_H' in config.h.in.
-    AC_CHECK_FUNCS(INTTYPES_H)
-  fi

   AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
   AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
     [#include <sys/types.h>


@@ -21,7 +15,8 @@ AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
     jm_ac_cv_header_inttypes_h=yes,
     jm_ac_cv_header_inttypes_h=no)])
   if test $jm_ac_cv_header_inttypes_h = yes; then
     jm_ac_cv_header_inttypes_h=yes,
     jm_ac_cv_header_inttypes_h=no)])
   if test $jm_ac_cv_header_inttypes_h = yes; then

-    ac_kludge=HAVE_INTTYPES_H
-    AC_DEFINE_UNQUOTED($ac_kludge)
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+   and declares uintmax_t. ])

   fi
 ])
   fi
 ])

diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 3b7bdfbc61a017c9e32213cc3d5da9f50744a3a3..8378645c9d7c8ba0f44e8612c216bfa6392b2ebb 100644 (file)
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3

 
 dnl From Jim Meyering.
 dnl Determine whether lstat has the bug that it succeeds when given the
 
 dnl From Jim Meyering.
 dnl Determine whether lstat has the bug that it succeeds when given the


@@ -30,22 +30,10 @@ AC_DEFUN(jm_FUNC_LSTAT,
         jm_cv_func_lstat_empty_string_bug=yes)
   ])
   if test $jm_cv_func_lstat_empty_string_bug = yes; then
         jm_cv_func_lstat_empty_string_bug=yes)
   ])
   if test $jm_cv_func_lstat_empty_string_bug = yes; then

-

     LIBOBJS="$LIBOBJS lstat.o"
     LIBOBJS="$LIBOBJS lstat.o"

-
-    if test $jm_cv_func_lstat_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(LSTAT_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_LSTAT_EMPTY_STRING_BUG
-      AC_DEFINE_UNQUOTED($ac_kludge)
-    fi
+    AC_DEFINE_UNQUOTED(HAVE_LSTAT_EMPTY_STRING_BUG, 1,
+[Define if lstat has the bug that it succeeds when given the zero-length
+   file name argument.  The lstat from SunOS4.1.4 and the Hurd as of 1998-11-01)
+   do this. ])

   fi
 ])
   fi
 ])

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index bd3cad46660bb1262e15114e86112ffb4377f495..85d62efa82b8f31595213d97f8021be277216fc8 100644 (file)
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2

 
 dnl From Jim Meyering.
 dnl Determine whether malloc accepts 0 as its argument.
 
 dnl From Jim Meyering.
 dnl Determine whether malloc accepts 0 as its argument.


@@ -12,16 +12,10 @@ dnl
 
 AC_DEFUN(jm_FUNC_MALLOC,
 [
 
 AC_DEFUN(jm_FUNC_MALLOC,
 [

- 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_MALLOC_CHECK)
- fi

  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken malloc -- as it might if this test were omitted.
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken malloc -- as it might if this test were omitted.

- ac_kludge=HAVE_DONE_WORKING_MALLOC_CHECK
- AC_DEFINE_UNQUOTED($ac_kludge)
+ AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
+                    [Define if the malloc check has been performed. ])

 
  AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
   [AC_TRY_RUN([
 
  AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
   [AC_TRY_RUN([

diff --git a/m4/readdir.m4 b/m4/readdir.m4
index d2b1a557e121dca3b90dbaf10d4bc5d2001ae518..74616d462b7c78c8a6010acc0711ecdbb4021cd3 100644 (file)
--- a/m4/readdir.m4
+++ b/m4/readdir.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2

 
 dnl SunOS's readdir is broken in such a way that rm.c has to add extra code
 dnl to test whether a NULL return value really means there are no more files
 
 dnl SunOS's readdir is broken in such a way that rm.c has to add extra code
 dnl to test whether a NULL return value really means there are no more files


@@ -126,16 +126,8 @@ AC_CACHE_CHECK([for working readdir], jm_cv_func_working_readdir,
   jm_cv_func_working_readdir=no,
   jm_cv_func_working_readdir=no)])
 
   jm_cv_func_working_readdir=no,
   jm_cv_func_working_readdir=no)])
 

-  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 HAVE_-prefixed symbol in config.h.in.
-    AC_CHECK_FUNCS(WORKING_READDIR)
-  fi
-
-

   if test $jm_cv_func_working_readdir = yes; then
   if test $jm_cv_func_working_readdir = yes; then

-    ac_kludge=HAVE_WORKING_READDIR
-    AC_DEFINE_UNQUOTED($ac_kludge)
+    AC_DEFINE_UNQUOTED(HAVE_WORKING_READDIR, 1,
+[Define if readdir is found to work properly in some unusual cases. ])

   fi
 ])
   fi
 ])

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.
 
 dnl From Jim Meyering.
 dnl Determine whether realloc works when both arguments are 0.


@@ -12,16 +12,10 @@ dnl
 
 AC_DEFUN(jm_FUNC_REALLOC,
 [
 
 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.
  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([
 
  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,
 # 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
      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
  ]
 )
   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
 
 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
         jm_cv_func_stat_empty_string_bug=yes)
   ])
   if test $jm_cv_func_stat_empty_string_bug = yes; then

-

     LIBOBJS="$LIBOBJS stat.o"
     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
 ])
   fi
 ])

diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4
index 7af3d1470bf86c8dfaa517de4eb453ffd7789a42..14d777259b0dc072d82eeec589638a803586a164 100644 (file)
--- a/m4/utimbuf.m4
+++ b/m4/utimbuf.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2

 
 dnl From Jim Meyering
 
 
 dnl From Jim Meyering
 


@@ -33,17 +33,8 @@ AC_DEFUN(jm_STRUCT_UTIMBUF,
     ])
 
   if test $fu_cv_sys_struct_utimbuf = yes; then
     ])
 
   if test $fu_cv_sys_struct_utimbuf = 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(STRUCT_UTIMBUF)
-    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_STRUCT_UTIMBUF
-    AC_DEFINE_UNQUOTED($ac_kludge)
+    AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1,
+[Define if struct utimbuf is declared -- usually in <utime.h>.
+   Some systems have utime.h but don't declare the struct anywhere. ])

   fi
 ])
   fi
 ])

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index ce9f86bf7bf13932c8e6a5f08e0eeb87e21443ac..f91e6885aa5aa35f75f1279f91f9cbede6c69bb2 100644 (file)
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,6 +1,7 @@
-#serial 2
+#serial 3

 
 

-dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL.
+dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL,
+dnl then do case-insensitive s/utime/utimes/.

 
 AC_DEFUN(jm_FUNC_UTIMES_NULL,
 [AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null,
 
 AC_DEFUN(jm_FUNC_UTIMES_NULL,
 [AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null,


@@ -22,18 +23,8 @@ exit(!(stat ("conftestdata", &s) == 0 && utimes("conftestdata", (long *)0) == 0
 rm -f core core.* *.core])
 
     if test $ac_cv_func_utimes_null = yes; then
 rm -f core core.* *.core])
 
     if test $ac_cv_func_utimes_null = 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(UTIMES_NULL)
-      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_UTIMES_NULL
-      AC_DEFINE_UNQUOTED($ac_kludge)
+      AC_DEFINE_UNQUOTED(HAVE_UTIMES_NULL, 1,
+                        [Define if utimes accepts a null argument])

     fi
   ]
 )
     fi
   ]
 )