X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffopen.m4;h=3337cc991d3677029436e56e04ca3d9942e4d1bc;hb=a77413333408e54b8d6c4e19918098794cef4b4b;hp=757d4a15581bf39a3c6f0167ed4187ad4a85c1a9;hpb=fd9f58dc85f6a45cd244c78a54ad4610c01dbb15;p=gnulib.git

diff --git a/m4/fopen.m4 b/m4/fopen.m4
index 757d4a155..3337cc991 100644
--- a/m4/fopen.m4
+++ b/m4/fopen.m4
@@ -1,5 +1,5 @@
-# fopen.m4 serial 6
-dnl Copyright (C) 2007-2010 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.
@@ -21,17 +21,20 @@ 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
-               aix* | hpux* | solaris2.[0-9]*)
+               aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
                  gl_cv_func_fopen_slash="guessing no" ;;
                *)
                  gl_cv_func_fopen_slash="guessing yes" ;;
@@ -49,14 +52,7 @@ changequote([,])dnl
       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])
-])
+AC_DEFUN([gl_PREREQ_FOPEN], [:])