X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fputenv.m4;h=1497b4a7978927c993e6e8a183e6b4ce699639f6;hb=21492d6c3ca00ff0827528640804732f2ed66470;hp=9c76a006fa1ba7ee54570a1cc29210e31af616d0;hpb=5fe5923a00c8e66b8cae09da36b9b4e558cb47d8;p=gnulib.git

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 9c76a006f..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.
@@ -14,28 +14,27 @@ AC_DEFUN([gl_FUNC_PUTENV],
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_CACHE_CHECK([for putenv compatible with GNU and SVID],
    [gl_cv_func_svid_putenv],
-   [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[
+   [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;
-	      ])],
-	     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)
+              ]])],
+             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 $gl_cv_func_svid_putenv = no; then
     REPLACE_PUTENV=1
-    AC_LIBOBJ(putenv)
   fi
 ])