summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-08 12:15:52 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:06:06 +0200
commit0584bc393f9cfc430bac01514eb9533e3934b36c (patch)
tree95e1fc1668105ac3cabf116ace81719fab9c8b4e
parent4dc4f1e228af045c09a926cc7b86e2cccdb4954a (diff)
downloadgnulib-0584bc393f9cfc430bac01514eb9533e3934b36c.tar.gz
getlogin: Move AC_LIBOBJ invocations to module description.
* m4/getlogin.m4 (gl_FUNC_GETLOGIN): Move AC_LIBOBJ invocation from here... * modules/getlogin (configure.ac): ... to here.
-rw-r--r--ChangeLog7
-rw-r--r--m4/getlogin.m43
-rw-r--r--modules/getlogin3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cda5621640..83c6bfbd81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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...
+ * modules/getlogin (configure.ac): ... to here.
+
+2011-05-08 Bruno Haible <bruno@clisp.org>
+
getloadavg: Move AC_LIBOBJ invocations to module description.
* m4/getloadavg.m4 (gl_FUNC_GETDELIM): Set HAVE_GETLOADAVG. Move
AC_LIBOBJ and gl_PREREQ_GETLOADAVG invocations from here...
diff --git a/m4/getlogin.m4 b/m4/getlogin.m4
index 6200181084..f4140ac115 100644
--- a/m4/getlogin.m4
+++ b/m4/getlogin.m4
@@ -1,4 +1,4 @@
-# getlogin.m4 serial 2
+# getlogin.m4 serial 3
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,6 @@ AC_DEFUN([gl_FUNC_GETLOGIN],
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
AC_CHECK_FUNCS_ONCE([getlogin])
if test $ac_cv_func_getlogin = no; then
- AC_LIBOBJ([getlogin])
HAVE_GETLOGIN=0
fi
])
diff --git a/modules/getlogin b/modules/getlogin
index 4507743b37..379052af72 100644
--- a/modules/getlogin
+++ b/modules/getlogin
@@ -10,6 +10,9 @@ unistd
configure.ac:
gl_FUNC_GETLOGIN
+if test $HAVE_GETLOGIN = 0; then
+ AC_LIBOBJ([getlogin])
+fi
gl_UNISTD_MODULE_INDICATOR([getlogin])
Makefile.am: