Sync from gnulib. Also:

(gt_FUNC_SETENV): Undo private change that added an
AC_LIBSOURCES line here, since Bruno didn't buy it back.  Instead,
update ../lib/Makefile.am to mention the files explicitly.

diff --git a/m4/setenv.m4 b/m4/setenv.m4
index 121091593901b7205ae46fc4753403c4ccda3624..623fcf2b553b327f8cf699db6d6038f064ed23de 100644 (file)
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,13 +1,11 @@
 # setenv.m4 serial 6
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006 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_LIBSOURCES([setenv.c, unsetenv.c, setenv.h])
-
   AC_REPLACE_FUNCS(setenv unsetenv)
   if test $ac_cv_func_setenv = no; then
     gl_PREREQ_SETENV
@@ -59,7 +57,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 +64,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)
 ])