X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fopen.m4;h=3202886aa071cede6de6ecc0fcd68f24030bf6bf;hb=68dfc9591e97db34b5ba693da028ff1f356a12b7;hp=fab0ad987abbf23e8766350aded5b46fe9a48bca;hpb=e2600ffdcf6c35561545d553e07e52e0db8f9a38;p=gnulib.git

diff --git a/m4/open.m4 b/m4/open.m4
index fab0ad987..3202886aa 100644
--- a/m4/open.m4
+++ b/m4/open.m4
@@ -1,17 +1,15 @@
-# open.m4 serial 3
-dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+# open.m4 serial 6
+dnl Copyright (C) 2007-2009 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.
 
 AC_DEFUN([gl_FUNC_OPEN],
 [
-  AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
     mingw* | pw*)
-      REPLACE_OPEN=1
-      AC_LIBOBJ([open])
+      gl_REPLACE_OPEN
       ;;
     *)
       dnl open("foo/") should not create a file when the file name has a
@@ -41,19 +39,29 @@ changequote([,])dnl
         ])
       case "$gl_cv_func_open_slash" in
         *no)
-          AC_DEFINE([OPEN_TRAILING_SLASH_BUG], 1,
+          AC_DEFINE([OPEN_TRAILING_SLASH_BUG], [1],
             [Define to 1 if open() fails to recognize a trailing slash.])
-          REPLACE_OPEN=1
-          AC_LIBOBJ([open])
-          gl_PREREQ_OPEN
+          gl_REPLACE_OPEN
           ;;
       esac
       ;;
   esac
 ])
 
+AC_DEFUN([gl_REPLACE_OPEN],
+[
+  AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
+  if test $REPLACE_OPEN != 1; then
+    AC_LIBOBJ([open])
+    gl_PREREQ_OPEN
+  fi
+  REPLACE_OPEN=1
+])
+
 # Prerequisites of lib/open.c.
 AC_DEFUN([gl_PREREQ_OPEN],
 [
   AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T])
+  :
 ])