X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Flchown.m4;h=743ed5b0c3f1a145be71d5590da9ac1706f6f33d;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=f0d67fe806cc6bc9e516d44d00550a3c4f789f67;hpb=2d4d7d9d00fe33b6f5291e00a30b6c1016775b74;p=gnulib.git

diff --git a/m4/lchown.m4 b/m4/lchown.m4
index f0d67fe80..743ed5b0c 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,8 +1,8 @@
-# serial 15
+# serial 17
 # Determine whether we need the lchown wrapper.
 
-dnl Copyright (C) 1998, 2001, 2003-2007, 2009 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2014 Free Software Foundation,
+dnl Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -17,13 +17,22 @@ AC_DEFUN([gl_FUNC_LCHOWN],
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_CHOWN])
   AC_CHECK_FUNCS_ONCE([lchmod])
-  AC_REPLACE_FUNCS([lchown])
+  AC_CHECK_FUNCS([lchown])
   if test $ac_cv_func_lchown = no; then
     HAVE_LCHOWN=0
-  elif test "$gl_cv_func_chown_slash_works" != yes \
-      || test "$gl_cv_func_chown_ctime_works" != yes; then
+  else
     dnl Trailing slash and ctime bugs in chown also occur in lchown.
-    AC_LIBOBJ([lchown])
-    REPLACE_LCHOWN=1
+    case "$gl_cv_func_chown_slash_works" in
+      *yes) ;;
+      *)
+        REPLACE_LCHOWN=1
+        ;;
+    esac
+    case "$gl_cv_func_chown_ctime_works" in
+      *yes) ;;
+      *)
+        REPLACE_LCHOWN=1
+        ;;
+    esac
   fi
 ])