X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffopen.m4;h=3337cc991d3677029436e56e04ca3d9942e4d1bc;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=bc622685cd87beb2d24324514d313b85b7b5cf0f;hpb=42d1eda5dcce2d68deab7a642e7f29bcd7144a0d;p=gnulib.git

diff --git a/m4/fopen.m4 b/m4/fopen.m4
index bc622685c..3337cc991 100644
--- a/m4/fopen.m4
+++ b/m4/fopen.m4
@@ -1,5 +1,5 @@
-# fopen.m4 serial 4
-dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
+# fopen.m4 serial 9
+dnl Copyright (C) 2007-2013 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
@@ -19,39 +21,38 @@ AC_DEFUN([gl_FUNC_FOPEN],
       AC_CACHE_CHECK([whether fopen recognizes a trailing slash],
         [gl_cv_func_fopen_slash],
         [
-          AC_TRY_RUN([
+          AC_RUN_IFELSE(
+            [AC_LANG_SOURCE([[
 #include <stddef.h>
 #include <stdio.h>
 int main ()
 {
   return fopen ("conftest.sl/", "w") != NULL;
-}], [gl_cv_func_fopen_slash=yes], [gl_cv_func_fopen_slash=no],
+}]])],
+            [gl_cv_func_fopen_slash=yes],
+            [gl_cv_func_fopen_slash=no],
             [
 changequote(,)dnl
              case "$host_os" in
-               solaris2.[0-9]*) gl_cv_func_fopen_slash="guessing no" ;;
-               hpux*)           gl_cv_func_fopen_slash="guessing no" ;;
-               *)               gl_cv_func_fopen_slash="guessing yes" ;;
+               aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
+                 gl_cv_func_fopen_slash="guessing no" ;;
+               *)
+                 gl_cv_func_fopen_slash="guessing yes" ;;
              esac
 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])
-          gl_PREREQ_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
 ])
 
 # Prerequisites of lib/fopen.c.
-AC_DEFUN([gl_PREREQ_FOPEN],
-[
-  AC_REQUIRE([AC_C_INLINE])
-])
+AC_DEFUN([gl_PREREQ_FOPEN], [:])