Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15089:9a04eac49081

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 00:00:35 +0200
parents 809af8ef1bf3
children e29fbc771e57
files ChangeLog m4/setenv.m4 modules/setenv
diffstat 3 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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...
--- 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 @@
       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
--- a/modules/setenv
+++ b/modules/setenv
@@ -14,6 +14,9 @@
 
 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: