getpass-gnu: Move AC_LIBOBJ invocations to module description.

* m4/getpass.m4 (gl_FUNC_GETPASS_GNU): Set REPLACE_GETPASS. Move
AC_LIBOBJ and gl_PREREQ_GETPASS invocations from here...
* modules/getpass-gnu (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index f2aad564acf7937b9490eab9c020ad3b31f308fe..da75d62fbd4503ff31038fc741e2a28cac92a00c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
+       getpass-gnu: Move AC_LIBOBJ invocations to module description.
+       * m4/getpass.m4 (gl_FUNC_GETPASS_GNU): Set REPLACE_GETPASS. Move
+       AC_LIBOBJ and gl_PREREQ_GETPASS invocations from here...
+       * modules/getpass-gnu (configure.ac): ... to here.
+
 2011-05-08  Bruno Haible  <bruno@clisp.org>
 
        getpass: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/getpass.m4 b/m4/getpass.m4
index 9ec351750d04c64c84fbaec8003831c0eb7533e2..64cee1ea87462ffbc71e0f440040c68c206d80d4 100644 (file)
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -29,13 +29,15 @@ AC_DEFUN([gl_FUNC_GETPASS_GNU],
 
   AC_CHECK_DECLS_ONCE([getpass])
   dnl TODO: Detect when GNU getpass() is already found in glibc.
-  AC_LIBOBJ([getpass])
-  gl_PREREQ_GETPASS
-  dnl We must choose a different name for our function, since on ELF systems
-  dnl an unusable getpass() in libc.so would override our getpass() if it is
-  dnl compiled into a shared library.
-  AC_DEFINE([getpass], [gnu_getpass],
-    [Define to a replacement function name for getpass().])
+  REPLACE_GETPASS=1
+
+  if test $REPLACE_GETPASS = 1; then
+    dnl We must choose a different name for our function, since on ELF systems
+    dnl an unusable getpass() in libc.so would override our getpass() if it is
+    dnl compiled into a shared library.
+    AC_DEFINE([getpass], [gnu_getpass],
+      [Define to a replacement function name for getpass().])
+  fi
 ])
 
 # Prerequisites of lib/getpass.c.

diff --git a/modules/getpass-gnu b/modules/getpass-gnu
index 92e2d798df13763ecaf5af8387a95ea80f981040..cd83015ee6ac6f0005ca15cc6cece7c6ecab3f9f 100644 (file)
--- a/modules/getpass-gnu
+++ b/modules/getpass-gnu
@@ -13,6 +13,10 @@ stdbool
 
 configure.ac:
 gl_FUNC_GETPASS_GNU
+if test $REPLACE_GETPASS = 1; then
+  AC_LIBOBJ([getpass])
+  gl_PREREQ_GETPASS
+fi
 
 Makefile.am: