X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fputenv.m4;h=43a5dc5bee6c38b5e2a31671ea64c8a3c9c4c5dd;hb=48ee8b2ef2165371632bc30c5f183f64d1e7f50e;hp=0bb17f415afa152ff4ca87b138d15e2f24a5e9ac;hpb=c4da5fc90ff7ff8ef395c84be4b14e0a3d404cbb;p=gnulib.git

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 0bb17f415..43a5dc5be 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,10 +1,8 @@
-# putenv.m4 serial 8
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# putenv.m4 serial 12
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 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.
 
 dnl From Jim Meyering.
 dnl
@@ -13,25 +11,21 @@ dnl The putenv in libc on at least SunOS 4.1.4 does *not* do that.
 
 AC_DEFUN([gl_FUNC_PUTENV],
 [AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
-  [AC_TRY_RUN([
-    int
-    main ()
-    {
-      /* Put it in env.  */
-      if (putenv ("CONFTEST_putenv=val"))
-        exit (1);
+  [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"))
-        exit (1);
+    /* Try to remove it.  */
+    if (putenv ("CONFTEST_putenv"))
+      return 1;
 
-      /* Make sure it was deleted.  */
-      if (getenv ("CONFTEST_putenv") != 0)
-        exit (1);
+    /* Make sure it was deleted.  */
+    if (getenv ("CONFTEST_putenv") != 0)
+      return 1;
 
-      exit (0);
-    }
-	      ],
+    return 0;
+	      ])],
 	     jm_cv_func_svid_putenv=yes,
 	     jm_cv_func_svid_putenv=no,
 	     dnl When crosscompiling, assume putenv is broken.
@@ -41,11 +35,5 @@ AC_DEFUN([gl_FUNC_PUTENV],
     AC_LIBOBJ(putenv)
     AC_DEFINE(putenv, rpl_putenv,
       [Define to rpl_putenv if the replacement function should be used.])
-    gl_PREREQ_PUTENV
   fi
 ])
-
-# Prerequisites of lib/putenv.c.
-AC_DEFUN([gl_PREREQ_PUTENV], [
-  AC_CHECK_HEADERS_ONCE(unistd.h)
-])