(jm_PREREQ_STAT): Remove macro. It is specific to coreutils' stat program.

[gnulib.git] / m4 / setenv.m4

diff --git a/m4/setenv.m4 b/m4/setenv.m4
index 832193b..3b19a29 100644 (file)
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,16 +1,27 @@
-# setenv.m4 serial 2 (gettext-0.11.1)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# setenv.m4 serial 4
+dnl Copyright (C) 2001-2003 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.
 
 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.
 

+AC_DEFUN([gt_FUNC_SETENV],
+[
+  AC_REPLACE_FUNCS(setenv unsetenv)
+  if test $ac_cv_func_setenv = no; then
+    gl_PREREQ_SETENV
+  fi
+  if test $ac_cv_func_unsetenv = no; then
+    gl_PREREQ_UNSETENV
+  fi
+])
+

 # Check if a variable is properly declared.
 # gt_CHECK_VAR_DECL(includes,variable)
 AC_DEFUN([gt_CHECK_VAR_DECL],
 [
 # Check if a variable is properly declared.
 # gt_CHECK_VAR_DECL(includes,variable)
 AC_DEFUN([gt_CHECK_VAR_DECL],
 [

-  define(gt_cv_var, [gt_cv_var_]$2[_declaration])
+  define([gt_cv_var], [gt_cv_var_]$2[_declaration])

   AC_MSG_CHECKING([if $2 is properly declared])
   AC_CACHE_VAL(gt_cv_var, [
     AC_TRY_COMPILE([$1
   AC_MSG_CHECKING([if $2 is properly declared])
   AC_CACHE_VAL(gt_cv_var, [
     AC_TRY_COMPILE([$1


@@ -25,13 +36,21 @@ AC_DEFUN([gt_CHECK_VAR_DECL],
   fi
 ])
 
   fi
 ])
 

-# Prerequisites of lib/setenv.c
-
-AC_DEFUN([gt_FUNC_SETENV],
+# Prerequisites of lib/setenv.c.
+AC_DEFUN([gl_PREREQ_SETENV],

 [
 [

-  AC_REPLACE_FUNCS(setenv unsetenv)
-  AC_CHECK_HEADERS(search.h stdlib.h string.h unistd.h)
+  AC_REQUIRE([AC_FUNC_ALLOCA])
+  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)
 ])
   AC_CHECK_FUNCS(tsearch)
   gt_CHECK_VAR_DECL([#include <errno.h>], errno)
   gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
 ])

+
+# Prerequisites of lib/unsetenv.c.
+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)
+])