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

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 733a49642..39a6e7568 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,13 +1,12 @@
-#serial 1
+#serial 5
 
 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.
 dnl
 
-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 +33,8 @@ 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.])
   fi
 ])