From: Bruno Haible <bruno@clisp.org>
Date: Sun, 8 May 2011 10:18:00 +0000 (+0200)
Subject: getlogin_r: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2559
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=4a0e634c15e56c346f71b98082ab9d8c11c46b2a;p=gnulib.git

getlogin_r: Move AC_LIBOBJ invocations to module description.

* m4/getlogin_r.m4 (gl_FUNC_GETLOGIN_R): Move AC_LIBOBJ and
gl_PREREQ_GETLOGIN_R invocations from here...
* modules/getlogin_r (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index 83c6bfbd8..c742d4491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-08  Bruno Haible  <bruno@clisp.org>
 
+	getlogin_r: Move AC_LIBOBJ invocations to module description.
+	* m4/getlogin_r.m4 (gl_FUNC_GETLOGIN_R): Move AC_LIBOBJ and
+	gl_PREREQ_GETLOGIN_R invocations from here...
+	* modules/getlogin_r (configure.ac): ... to here.
+
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
 	getlogin: Move AC_LIBOBJ invocations to module description.
 	* m4/getlogin.m4 (gl_FUNC_GETLOGIN): Move AC_LIBOBJ invocation from
 	here...
diff --git a/m4/getlogin_r.m4 b/m4/getlogin_r.m4
index 89a60d5e2..ad15c9879 100644
--- a/m4/getlogin_r.m4
+++ b/m4/getlogin_r.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 
 # Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc.
 #
@@ -76,10 +76,6 @@ main (void)
       *) REPLACE_GETLOGIN_R=1 ;;
     esac
   fi
-  if test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1; then
-    AC_LIBOBJ([getlogin_r])
-    gl_PREREQ_GETLOGIN_R
-  fi
 ])
 
 AC_DEFUN([gl_PREREQ_GETLOGIN_R],
diff --git a/modules/getlogin_r b/modules/getlogin_r
index c0fb4a691..5406d9472 100644
--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -12,6 +12,10 @@ memchr          [test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1]
 
 configure.ac:
 gl_FUNC_GETLOGIN_R
+if test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1; then
+  AC_LIBOBJ([getlogin_r])
+  gl_PREREQ_GETLOGIN_R
+fi
 gl_UNISTD_MODULE_INDICATOR([getlogin_r])
 
 Makefile.am: