X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fputenv.m4;h=f9fcc8cd8c66c6a483c87c59fbef4b4451bddcb7;hb=54c26afcfef8e232fbe34b601d7459bab899b2b5;hp=733a496426a76fca29507ef5652357a1212d0876;hpb=b851f6e638f0e7b509fdb270f27ffd63fd0ef05c;p=gnulib.git

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 733a49642..f9fcc8cd8 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,10 +1,9 @@
-#serial 1
+#serial 3
 
 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,
@@ -34,7 +33,9 @@ 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_SUBST(LIBOBJS)
+    LIBOBJS="$LIBOBJS putenv.$ac_objext"
+    AC_DEFINE_UNQUOTED(putenv, rpl_putenv,
+      [Define to rpl_putenv if the replacement function should be used.])
   fi
 ])