X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsetenv.m4;h=d6901de240d60e38379a5fbe6bd807a133b19ba3;hb=018d784ec357cbce8d1eae53e26c05b8964d3f7b;hp=88d5e4c206697ed9bf98e040edfd603ec2213bf7;hpb=915849390e40c7008a9e6d1534bb476afae66f25;p=gnulib.git

diff --git a/m4/setenv.m4 b/m4/setenv.m4
index 88d5e4c20..d6901de24 100644
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,18 +1,30 @@
-# setenv.m4 serial 5
-dnl Copyright (C) 2001-2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# setenv.m4 serial 8
+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
+])
+
+# Like gl_FUNC_SETENV, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
+[
+  AC_CHECK_FUNCS_ONCE([setenv])
+  gl_PREREQ_SETENV
+])
+
+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,
@@ -59,7 +71,6 @@ AC_DEFUN([gl_PREREQ_SETENV],
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_HEADERS(search.h)
   AC_CHECK_FUNCS(tsearch)
-  gt_CHECK_VAR_DECL([#include <errno.h>], errno)
   gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
 ])
 
@@ -67,6 +78,5 @@ AC_DEFUN([gl_PREREQ_SETENV],
 AC_DEFUN([gl_PREREQ_UNSETENV],
 [
   AC_CHECK_HEADERS_ONCE(unistd.h)
-  gt_CHECK_VAR_DECL([#include <errno.h>], errno)
   gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
 ])