X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffopen.m4;h=6d2b094828ae382d2c132942401e235e4ebbc9a6;hb=fc80165c92e8b92da6e88e4fdb9c472125124fa0;hp=c1bbe8842128286c9316667625455db3710f709f;hpb=bf22d71aabc025f08e01ade3fd65a34eb8e823dd;p=gnulib.git

diff --git a/m4/fopen.m4 b/m4/fopen.m4
index c1bbe8842..6d2b09482 100644
--- a/m4/fopen.m4
+++ b/m4/fopen.m4
@@ -1,5 +1,5 @@
-# fopen.m4 serial 2
-dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+# fopen.m4 serial 5
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,8 +10,10 @@ AC_DEFUN([gl_FUNC_FOPEN],
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
     mingw* | pw*)
+      dnl Replace fopen, for handling of "/dev/null".
       REPLACE_FOPEN=1
-      AC_LIBOBJ([fopen])
+      dnl fopen on mingw also has the trailing slash bug.
+      gl_cv_func_fopen_slash="guessing no"
       ;;
     *)
       dnl fopen("foo/", "w") should not create a file when the file name has a
@@ -37,14 +39,23 @@ changequote([,])dnl
             ])
           rm -f conftest.sl
         ])
-      case "$gl_cv_func_fopen_slash" in
-        *no)
-          AC_DEFINE([FOPEN_TRAILING_SLASH_BUG], 1,
-            [Define to 1 if fopen() fails to recognize a trailing slash.])
-          REPLACE_FOPEN=1
-          AC_LIBOBJ([fopen])
-          ;;
-      esac
       ;;
   esac
+  case "$gl_cv_func_fopen_slash" in
+    *no)
+      AC_DEFINE([FOPEN_TRAILING_SLASH_BUG], [1],
+        [Define to 1 if fopen() fails to recognize a trailing slash.])
+      REPLACE_FOPEN=1
+      ;;
+  esac
+  if test $REPLACE_FOPEN = 1; then
+    AC_LIBOBJ([fopen])
+    gl_PREREQ_FOPEN
+  fi
+])
+
+# Prerequisites of lib/fopen.c.
+AC_DEFUN([gl_PREREQ_FOPEN],
+[
+  AC_REQUIRE([AC_C_INLINE])
 ])