From: Bruno Haible <bruno@clisp.org>
Date: Sun, 8 May 2011 11:18:21 +0000 (+0200)
Subject: getpass: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2555
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=8440aa7f30a245f28c518a7bc446069130a09a3d;p=gnulib.git

getpass: Move AC_LIBOBJ invocations to module description.

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

diff --git a/ChangeLog b/ChangeLog
index 3291e64244..f2aad564ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
+	getpass: Move AC_LIBOBJ invocations to module description.
+	* m4/getpass.m4 (gl_FUNC_GETPASS): Set HAVE_GETPASS. Move AC_LIBOBJ and
+	gl_PREREQ_GETPASS invocations from here...
+	* modules/getpass (configure.ac): ... to here.
+
 2011-05-08  Bruno Haible  <bruno@clisp.org>
 
 	getpagesize: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/getpass.m4 b/m4/getpass.m4
index c6ec427f08..9ec351750d 100644
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -1,4 +1,4 @@
-# getpass.m4 serial 12
+# getpass.m4 serial 13
 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -11,10 +11,12 @@ AC_DEFUN([gl_FUNC_GETPASS],
   dnl Persuade Solaris <unistd.h> and <stdlib.h> to declare getpass().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
-  AC_REPLACE_FUNCS([getpass])
+  AC_CHECK_FUNCS([getpass])
   AC_CHECK_DECLS_ONCE([getpass])
-  if test $ac_cv_func_getpass = no; then
-    gl_PREREQ_GETPASS
+  if test $ac_cv_func_getpass = yes; then
+    HAVE_GETPASS=1
+  else
+    HAVE_GETPASS=0
   fi
 ])
 
diff --git a/modules/getpass b/modules/getpass
index 161c151273..c1cbc25574 100644
--- a/modules/getpass
+++ b/modules/getpass
@@ -15,6 +15,10 @@ strdup-posix
 
 configure.ac:
 gl_FUNC_GETPASS
+if test $HAVE_GETPASS = 0; then
+  AC_LIBOBJ([getpass])
+  gl_PREREQ_GETPASS
+fi
 
 Makefile.am: