From 997f64ac341af1d9e1c1700b43374c73c8131027 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 17 Jan 2009 17:39:50 +0100 Subject: [PATCH] Fix test-fopen failure on mingw. --- ChangeLog | 6 ++++++ m4/fopen.m4 | 26 +++++++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index b00193fd0..5986110d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-01-17 Bruno Haible + Fix replacement of fopen on mingw. + * m4/fopen.m4 (gl_FUNC_FOPEN): Define FOPEN_TRAILING_SLASH_BUG also on + mingw. + +2009-01-17 Bruno Haible + Fix compilation error on HP-UX 11.00, present since 2008-09-24. * lib/fopen.c: Include and . diff --git a/m4/fopen.m4 b/m4/fopen.m4 index bc622685c..aabe0228e 100644 --- a/m4/fopen.m4 +++ b/m4/fopen.m4 @@ -1,4 +1,4 @@ -# fopen.m4 serial 4 +# fopen.m4 serial 5 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, @@ -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 @@ -37,17 +39,19 @@ 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 + if test $REPLACE_FOPEN = 1; then + AC_LIBOBJ([fopen]) + gl_PREREQ_FOPEN + fi ]) # Prerequisites of lib/fopen.c. -- 2.11.0