summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2006-07-04 05:38:32 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2006-07-04 05:38:32 +0000
commit8e19f6282b0621f63b47716bd2eadfb9d466c758 (patch)
treebe53a4022328b2e6bea24a6eb7eb877e44843d8d
parentd380605f015ed8f48d27a844ea7e6f3c020e70b0 (diff)
downloadcoreutils-8e19f6282b0621f63b47716bd2eadfb9d466c758.tar.xz
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.
-rw-r--r--m4/setenv.m46
1 files changed, 1 insertions, 5 deletions
diff --git a/m4/setenv.m4 b/m4/setenv.m4
index 121091593..623fcf2b5 100644
--- 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)
])