summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-08 12:18:00 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:06:06 +0200
commit4a0e634c15e56c346f71b98082ab9d8c11c46b2a (patch)
tree91f9f14517ca3e727473dd5f048d58d892911c6a
parent0584bc393f9cfc430bac01514eb9533e3934b36c (diff)
downloadgnulib-4a0e634c15e56c346f71b98082ab9d8c11c46b2a.tar.gz
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.
-rw-r--r--ChangeLog7
-rw-r--r--m4/getlogin_r.m46
-rw-r--r--modules/getlogin_r4
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 83c6bfbd81..c742d4491c 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 89a60d5e2b..ad15c9879a 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 c0fb4a691f..5406d9472d 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: