# HG changeset patch # User Bruno Haible # Date 1304645223 -7200 # Node ID 5fac8bca3a41c897bffdb77f4aa246252036a05e # Parent bf19e5e939937e0f762237e1e51c124c428243ff chown: Respect rules for use of AC_LIBOBJ. * m4/chown.m4 (gl_FUNC_CHOWN): Move AC_LIBOBJ invocations from here... * modules/chown (configure.ac): ... to here. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-05 Bruno Haible + + chown: Respect rules for use of AC_LIBOBJ. + * m4/chown.m4 (gl_FUNC_CHOWN): Move AC_LIBOBJ invocations from here... + * modules/chown (configure.ac): ... to here. + 2011-05-05 Bruno Haible chdir-long: Move AC_LIBOBJ invocations to module description. diff --git a/m4/chown.m4 b/m4/chown.m4 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -1,4 +1,4 @@ -# serial 24 +# serial 25 # Determine whether we need the chown wrapper. dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2011 Free Software @@ -25,12 +25,10 @@ dnl mingw lacks chown altogether. if test $ac_cv_func_chown = no; then HAVE_CHOWN=0 - AC_LIBOBJ([chown]) else dnl Some old systems treated chown like lchown. if test $gl_cv_func_chown_follows_symlink = no; then REPLACE_CHOWN=1 - AC_LIBOBJ([chown]) fi dnl Some old systems tried to use uid/gid -1 literally. @@ -38,7 +36,6 @@ AC_DEFINE([CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE], [1], [Define if chown is not POSIX compliant regarding IDs of -1.]) REPLACE_CHOWN=1 - AC_LIBOBJ([chown]) fi dnl Solaris 9 ignores trailing slash. @@ -62,7 +59,6 @@ AC_DEFINE([CHOWN_TRAILING_SLASH_BUG], [1], [Define to 1 if chown mishandles trailing slash.]) REPLACE_CHOWN=1 - AC_LIBOBJ([chown]) fi dnl OpenBSD fails to update ctime if ownership does not change. @@ -90,11 +86,6 @@ AC_DEFINE([CHOWN_CHANGE_TIME_BUG], [1], [Define to 1 if chown fails to change ctime when at least one argument was not -1.]) REPLACE_CHOWN=1 - AC_LIBOBJ([chown]) - fi - - if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then - AC_LIBOBJ([fchown-stub]) fi fi ]) diff --git a/modules/chown b/modules/chown --- a/modules/chown +++ b/modules/chown @@ -15,6 +15,12 @@ configure.ac: gl_FUNC_CHOWN +if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then + AC_LIBOBJ([chown]) +fi +if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then + AC_LIBOBJ([fchown-stub]) +fi gl_UNISTD_MODULE_INDICATOR([chown]) Makefile.am: