Split gt_FUNC_SETENV into gl_FUNC_SETENV and gl_FUNC_UNSETENV.

diff --git a/ChangeLog b/ChangeLog
index 0198f96f2eb71eacb415f6cde9d7c0a5b1f8c52b..711c2f628511919b41f2589d6fdc58ef702073c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-03  Bruno Haible  <bruno@clisp.org>
+
+       * m4/setenv.m4 (gl_FUNC_SETENV, gl_FUNC_UNSETENV): New macros,
+       extracted from gt_FUNC_SETENV.
+       (gt_FUNC_SETENV): Remove macro.
+       * modules/setenv (configure.ac): Add gl_FUNC_SETENV, gl_FUNC_UNSETENV,
+       remove gt_FUNC_SETENV.
+
 2007-03-03  Bruno Haible  <bruno@clisp.org>
 
        * m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY): Define
@@ -26135,4 +26143,4 @@
 
        * m4/largefile.m4: Remove file (now that it's part of autoconf).
 
-2000-06-04  Paul Eggert  <eggert@twinsun.com>
+2000-06-04  Paul Eggert  <eggert@twinsun.com>
\ No newline at end of file

diff --git a/m4/setenv.m4 b/m4/setenv.m4
index 623fcf2b553b327f8cf699db6d6038f064ed23de..0d54a9613e64645119c791128b7fbf346164c551 100644 (file)
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,16 +1,23 @@
-# setenv.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
+# setenv.m4 serial 7
+dnl Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gt_FUNC_SETENV],
+AC_DEFUN([gl_FUNC_SETENV],
 [
-  AC_REPLACE_FUNCS(setenv unsetenv)
+  AC_CHECK_FUNCS_ONCE([setenv])
   if test $ac_cv_func_setenv = no; then
+    AC_LIBOBJ([setenv])
     gl_PREREQ_SETENV
   fi
+])
+
+AC_DEFUN([gl_FUNC_UNSETENV],
+[
+  AC_CHECK_FUNCS([unsetenv])
   if test $ac_cv_func_unsetenv = no; then
+    AC_LIBOBJ([unsetenv])
     gl_PREREQ_UNSETENV
   else
     AC_CACHE_CHECK([for unsetenv() return type], gt_cv_func_unsetenv_ret,