X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fputenv.m4;h=1497b4a7978927c993e6e8a183e6b4ce699639f6;hb=f09be9e0ac9122c6cdba13ba1ccb8280f2181faa;hp=226a9ebcee62264b249008a4d35fe86c652f178d;hpb=564e9e880f76a7cda00881e37a69386dfeaddd93;p=gnulib.git

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 226a9ebce..1497b4a79 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,5 +1,5 @@
-# putenv.m4 serial 14
-dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
+# putenv.m4 serial 18
+dnl Copyright (C) 2002-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,29 +13,28 @@ AC_DEFUN([gl_FUNC_PUTENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_CACHE_CHECK([for putenv compatible with GNU and SVID],
-   [jm_cv_func_svid_putenv],
-   [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[
+   [gl_cv_func_svid_putenv],
+   [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[
     /* Put it in env.  */
     if (putenv ("CONFTEST_putenv=val"))
       return 1;
 
     /* Try to remove it.  */
     if (putenv ("CONFTEST_putenv"))
-      return 1;
+      return 2;
 
     /* Make sure it was deleted.  */
     if (getenv ("CONFTEST_putenv") != 0)
-      return 1;
+      return 3;
 
     return 0;
-	      ])],
-	     jm_cv_func_svid_putenv=yes,
-	     jm_cv_func_svid_putenv=no,
-	     dnl When crosscompiling, assume putenv is broken.
-	     jm_cv_func_svid_putenv=no)
+              ]])],
+             gl_cv_func_svid_putenv=yes,
+             gl_cv_func_svid_putenv=no,
+             dnl When crosscompiling, assume putenv is broken.
+             gl_cv_func_svid_putenv=no)
    ])
-  if test $jm_cv_func_svid_putenv = no; then
+  if test $gl_cv_func_svid_putenv = no; then
     REPLACE_PUTENV=1
-    AC_LIBOBJ(putenv)
   fi
 ])