Back out the last two changes, at least for now.

[gnulib.git] / m4 / putenv.m4

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 733a496..efaf056 100644 (file)
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,10 +1,9 @@
-#serial 1
+#serial 4
 
 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,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_UNQUOTED(putenv, rpl_putenv,
+      [Define to rpl_putenv if the replacement function should be used.])
   fi
 ])