Merge from coreutils.

[gnulib.git] / m4 / lstat.m4

diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 3b7bdfb..0c6362c 100644 (file)
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,51 +1,26 @@
-#serial 2
+#serial 11

 
 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

-dnl zero-length file name argument.  The lstat from SunOS4.1.4 and the Hurd
+dnl zero-length file name argument.  The lstat from SunOS 4.1.4 and the Hurd

 dnl (as of 1998-11-01) do this.
 dnl
 dnl If it does, then define HAVE_LSTAT_EMPTY_STRING_BUG and arrange to
 dnl compile the wrapper function.
 dnl
 
 dnl (as of 1998-11-01) do this.
 dnl
 dnl If it does, then define HAVE_LSTAT_EMPTY_STRING_BUG and arrange to
 dnl compile the wrapper function.
 dnl
 

-AC_DEFUN(jm_FUNC_LSTAT,
+AC_DEFUN([gl_FUNC_LSTAT],

 [
 [

- AC_CACHE_CHECK([whether lstat accepts an empty string],
-  jm_cv_func_lstat_empty_string_bug,
-  [AC_TRY_RUN([
-#   include <sys/types.h>
-#   include <sys/stat.h>
-
-    int
-    main ()
-    {
-      struct stat sbuf;
-      exit (lstat ("", &sbuf) ? 1 : 0);
-    }
-         ],
-        jm_cv_func_lstat_empty_string_bug=yes,
-        jm_cv_func_lstat_empty_string_bug=no,
-        dnl When crosscompiling, assume lstat is broken.
-        jm_cv_func_lstat_empty_string_bug=yes)
-  ])
-  if test $jm_cv_func_lstat_empty_string_bug = yes; then
-
-    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_FUNC_LSTAT
+  dnl Note: AC_FUNC_LSTAT does AC_LIBOBJ(lstat).
+  if test $ac_cv_func_lstat_empty_string_bug = yes; then
+    gl_PREREQ_LSTAT

   fi
 ])
   fi
 ])

+
+# Prerequisites of lib/lstat.c.
+AC_DEFUN([gl_PREREQ_LSTAT],
+[
+  AC_REQUIRE([AC_HEADER_STAT])
+  :
+])