--- a/ChangeLog	Wed Oct 08 22:35:55 2008 +0200
+++ b/ChangeLog	Thu Oct 09 13:20:03 2008 +0200
@@ -1,3 +1,10 @@
+2008-10-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	Fix organization of 'open' replacement.
+	* m4/open.m4 (gl_REPLACE_OPEN): New macro.
+	(gl_FUNC_OPEN): Use it.
+	(gl_PREREQ_OPEN): Add a : to make the body non-empty.
+
 2008-10-08  Bruno Haible  <bruno@clisp.org>
 
 	* modules/getdate-tests (test_getdata_LDADD): Add LIBINTL.

--- a/m4/open.m4	Wed Oct 08 22:35:55 2008 +0200
+++ b/m4/open.m4	Thu Oct 09 13:20:03 2008 +0200
@@ -1,4 +1,4 @@
-# open.m4 serial 3
+# open.m4 serial 4
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,12 +6,10 @@
 
 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
@@ -43,17 +41,26 @@
         *no)
           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])
+  :
 ])