From: Bruno Haible Date: Sun, 8 May 2011 09:25:18 +0000 (+0200) Subject: getcwd: Move AC_LIBOBJ invocations to module description. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=342c3921744f00e8139322ed90fe826275b0739d;p=pspp getcwd: Move AC_LIBOBJ invocations to module description. * m4/getcwd.m4 (gl_FUNC_GETCWD): Move AC_LIBOBJ and gl_PREREQ_GETCWD invocations from here... * modules/getcwd (configure.ac): ... to here. --- diff --git a/ChangeLog b/ChangeLog index eb1817feb8..df46330d4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-08 Bruno Haible + + getcwd: Move AC_LIBOBJ invocations to module description. + * m4/getcwd.m4 (gl_FUNC_GETCWD): Move AC_LIBOBJ and gl_PREREQ_GETCWD + invocations from here... + * modules/getcwd (configure.ac): ... to here. + 2011-05-08 Bruno Haible getcwd-lgpl: Move AC_LIBOBJ invocations to module description. diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index 91a2e7e869..269fdd7c65 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -97,10 +97,8 @@ AC_DEFUN([gl_FUNC_GETCWD], case $gl_cv_func_getcwd_null,$gl_cv_func_getcwd_path_max,$gl_abort_bug in *yes,yes,no) ;; *) - dnl Full replacement, overrides LGPL replacement. - REPLACE_GETCWD=1 - AC_LIBOBJ([getcwd]) - gl_PREREQ_GETCWD;; + dnl Full replacement lib/getcwd.c, overrides LGPL replacement. + REPLACE_GETCWD=1;; esac ]) diff --git a/modules/getcwd b/modules/getcwd index cc80bfe882..6b764d21c8 100644 --- a/modules/getcwd +++ b/modules/getcwd @@ -20,6 +20,10 @@ strdup-posix [test $REPLACE_GETCWD = 1] configure.ac: gl_FUNC_GETCWD +if test $REPLACE_GETCWD = 1; then + AC_LIBOBJ([getcwd]) + gl_PREREQ_GETCWD +fi gl_MODULE_INDICATOR([getcwd]) gl_UNISTD_MODULE_INDICATOR([getcwd])