X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fputenv.m4;h=f9fcc8cd8c66c6a483c87c59fbef4b4451bddcb7;hb=791139002dbb25492584d3be74aec3d932f98aa7;hp=0c4aebf4a71f365ad976c52008a3e80aed47bede;hpb=b24d0dabd37b1517cb181d7be20257e3a0c7cb91;p=gnulib.git

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 0c4aebf4a..f9fcc8cd8 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,15 +1,10 @@
-#serial 1
+#serial 3
 
 dnl From Jim Meyering.
 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
-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
 
 AC_DEFUN(jm_FUNC_PUTENV,
 [AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
@@ -38,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
 ])