From: Bruno Haible <bruno@clisp.org>
Date: Sat, 10 Apr 2010 20:30:16 +0000 (+0200)
Subject: fchownat: Fix a C++ test error on Solaris 8.
X-Git-Tag: stable/20100424~57
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=849156a4013178d4c6f392150e6da45a30ec7fad;p=gnulib.git

fchownat: Fix a C++ test error on Solaris 8.
(cherry picked from commit 15a0c625accdd9f8ff6b71ab62af36b8b3f408f8)
---

diff --git a/ChangeLog b/ChangeLog
index 3fdaaa423..686fc8f5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-10  Bruno Haible  <address@hidden>
+
+	fchownat: Fix a C++ test error on Solaris 8.
+	* m4/openat.m4 (gl_FUNC_FCHOWNAT): Don't set REPLACE_FCHOWNAT to 1 if
+	the function does not exist.
+
 2010-04-10  Bruno Haible  <bruno@clisp.org>
 
 	vasnprintf: Add more tests.
diff --git a/m4/openat.m4 b/m4/openat.m4
index 7975efb47..cfde8f9aa 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,4 +1,4 @@
-# serial 27
+# serial 28
 # See if we need to use our replacement for Solaris' openat et al functions.
 
 dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
@@ -106,11 +106,11 @@ AC_DEFUN([gl_FUNC_FCHOWNAT],
   AC_CHECK_FUNC([fchownat],
     [gl_FUNC_FCHOWNAT_DEREF_BUG([REPLACE_FCHOWNAT=1
       AC_DEFINE([FCHOWNAT_NOFOLLOW_BUG], [1], [Define to 1 if your
-      platform has fchownat, but it cannot perform lchown tasks.])])],
+      platform has fchownat, but it cannot perform lchown tasks.])
+      if test $REPLACE_CHOWN = 1; then
+        REPLACE_FCHOWNAT=1
+      fi])],
     [HAVE_FCHOWNAT=0])
-  if test $REPLACE_CHOWN = 1; then
-    REPLACE_FCHOWNAT=1
-  fi
   if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then
     AC_LIBOBJ([fchownat])
   fi