X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffopen.m4;h=4e19b291e38b81bbfcdd4800d3984caed619e8a1;hb=39a489fa27ab3873e0fc0f65844413f46fcb2117;hp=aabe0228e251e8375fea15287d9aa070631156e1;hpb=997f64ac341af1d9e1c1700b43374c73c8131027;p=gnulib.git

diff --git a/m4/fopen.m4 b/m4/fopen.m4
index aabe0228e..4e19b291e 100644
--- a/m4/fopen.m4
+++ b/m4/fopen.m4
@@ -1,5 +1,5 @@
-# fopen.m4 serial 5
-dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
+# fopen.m4 serial 8
+dnl Copyright (C) 2007-2011 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,19 +21,23 @@ 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
             ])
@@ -48,10 +52,6 @@ changequote([,])dnl
       REPLACE_FOPEN=1
       ;;
   esac
-  if test $REPLACE_FOPEN = 1; then
-    AC_LIBOBJ([fopen])
-    gl_PREREQ_FOPEN
-  fi
 ])
 
 # Prerequisites of lib/fopen.c.