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 eb1817feb89b77357c5bedbec7bfd658e7c1a5c6..df46330d4b4b4e78df639636ec22ba8ed07f7aea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        getcwd-lgpl: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index 91a2e7e8694190fe88f0823ce0df93505977d5ca..269fdd7c653e8da0752b6cceff34194aae6bca16 100644 (file)
--- 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 cc80bfe8827689c687911ffb03093b78134e3602..6b764d21c8f8669b3f2dd8c58726a19eb469b66b 100644 (file)
--- 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])