setenv: Move AC_LIBOBJ invocations to module description.

* m4/setenv.m4 (gl_FUNC_SETENV): Move AC_LIBOBJ invocations from
here...
* modules/setenv (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 8820ea4..57e3815 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+       setenv: Move AC_LIBOBJ invocations to module description.
+       * m4/setenv.m4 (gl_FUNC_SETENV): Move AC_LIBOBJ invocations from
+       here...
+       * modules/setenv (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
        selinux-h: Move AC_LIBOBJ invocations to module description.
        * m4/selinux-selinux-h.m4 (gl_HEADERS_SELINUX_SELINUX_H): Move
        AC_LIBOBJ invocation from here...

diff --git a/m4/setenv.m4 b/m4/setenv.m4
index c8b025c..eaa53b1 100644 (file)
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,4 +1,4 @@
-# setenv.m4 serial 22
+# setenv.m4 serial 23
 dnl Copyright (C) 2001-2004, 2006-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,
@@ -38,9 +38,6 @@ AC_DEFUN([gl_FUNC_SETENV],
       REPLACE_SETENV=1
     fi
   fi
-  if test $HAVE_SETENV$REPLACE_SETENV != 10; then
-    AC_LIBOBJ([setenv])
-  fi
 ])
 
 # Like gl_FUNC_SETENV, except prepare for separate compilation

diff --git a/modules/setenv b/modules/setenv
index 95ff0a0..cf534d2 100644 (file)
--- a/modules/setenv
+++ b/modules/setenv
@@ -14,6 +14,9 @@ environ         [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
 
 configure.ac:
 gl_FUNC_SETENV
+if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
+  AC_LIBOBJ([setenv])
+fi
 gl_STDLIB_MODULE_INDICATOR([setenv])
 
 Makefile.am: