From 4b79a20516739258867f4cfc629d6f646f2b260e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 20 Nov 2011 23:28:01 +0100 Subject: [PATCH] getcwd: Fix bug from 2009-09-10. * m4/getcwd.m4 (gl_FUNC_GETCWD): Treat "guessing yes" like "yes", not like "no". --- ChangeLog | 6 ++++++ m4/getcwd.m4 | 20 +++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8173a2ecf..c99b7018b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-11-20 Bruno Haible + + getcwd: Fix bug from 2009-09-10. + * m4/getcwd.m4 (gl_FUNC_GETCWD): Treat "guessing yes" like "yes", not + like "no". + 2011-11-20 Simon Josefsson * m4/manywarnings.m4: Add more warnings from gcc 4.6.2. diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index f828cf340..982ef4ed9 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -6,7 +6,7 @@ # with or without modifications, as long as this notice is preserved. # Written by Paul Eggert. -# serial 9 +# serial 10 AC_DEFUN([gl_FUNC_GETCWD_NULL], [ @@ -108,12 +108,18 @@ AC_DEFUN([gl_FUNC_GETCWD], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles gl_abort_bug=no - case $gl_cv_func_getcwd_null,$host_os in - *,mingw*) - gl_cv_func_getcwd_path_max=yes;; - yes,*) - gl_FUNC_GETCWD_PATH_MAX - gl_FUNC_GETCWD_ABORT_BUG([gl_abort_bug=yes]);; + case "$host_os" in + mingw*) + gl_cv_func_getcwd_path_max=yes + ;; + *) + case "$gl_cv_func_getcwd_null" in + *yes) + gl_FUNC_GETCWD_PATH_MAX + gl_FUNC_GETCWD_ABORT_BUG([gl_abort_bug=yes]) + ;; + esac + ;; esac case $gl_cv_func_getcwd_null,$gl_cv_func_getcwd_posix_signature$gl_cv_func_getcwd_path_max,$gl_abort_bug in -- 2.11.0