X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fputenv.m4;h=5a7aa4c16bea274d0976f8cf25d8a3bc51fc6297;hb=046192904daa36bfbe30eb7e263dd976346b9bd5;hp=733a496426a76fca29507ef5652357a1212d0876;hpb=b851f6e638f0e7b509fdb270f27ffd63fd0ef05c;p=gnulib.git

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 733a49642..5a7aa4c16 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,13 +1,17 @@
-#serial 1
+# putenv.m4 serial 6
+dnl Copyright (C) 2002 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 From Jim Meyering.
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl  /* Define to rpl_putenv if the replacement function should be used.  */
-dnl  #undef putenv
 dnl
+dnl Check whether putenv ("FOO") removes FOO from the environment.
+dnl The putenv in libc on at least SunOS 4.1.4 does *not* do that.
 
-AC_DEFUN(jm_FUNC_PUTENV,
+AC_DEFUN([jm_FUNC_PUTENV],
 [AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
   [AC_TRY_RUN([
     int
@@ -34,7 +38,16 @@ AC_DEFUN(jm_FUNC_PUTENV,
 	     jm_cv_func_svid_putenv=no)
   ])
   if test $jm_cv_func_svid_putenv = no; then
-    LIBOBJS="$LIBOBJS putenv.o"
-    AC_DEFINE_UNQUOTED(putenv, rpl_putenv)
+    AC_LIBOBJ(putenv)
+    AC_DEFINE(putenv, rpl_putenv,
+      [Define to rpl_putenv if the replacement function should be used.])
+    gl_PREREQ_PUTENV
   fi
 ])
+
+# Prerequisites of lib/putenv.c.
+AC_DEFUN([gl_PREREQ_PUTENV], [
+  AC_CHECK_HEADERS_ONCE(string.h unistd.h)
+  AC_CHECK_FUNCS_ONCE(memcpy)
+  AC_CHECK_FUNCS(strchr)
+])