* wcwidth.m4 (gl_FUNC_WCWIDTH): Simplify by using AC_CHECK_DECLS.

[gnulib.git] / m4 / putenv.m4

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index eb6ef5f..04556b9 100644 (file)
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,12 +1,15 @@
-#serial 5
+# putenv.m4 serial 11
+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
 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],
+AC_DEFUN([gl_FUNC_PUTENV],
 [AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
   [AC_TRY_RUN([
     int
@@ -14,17 +17,17 @@ AC_DEFUN([jm_FUNC_PUTENV],
     {
       /* Put it in env.  */
       if (putenv ("CONFTEST_putenv=val"))
-        exit (1);
+        return 1;
 
       /* Try to remove it.  */
       if (putenv ("CONFTEST_putenv"))
-        exit (1);
+        return 1;
 
       /* Make sure it was deleted.  */
       if (getenv ("CONFTEST_putenv") != 0)
-        exit (1);
+        return 1;
 
-      exit (0);
+      return 0;
     }
              ],
             jm_cv_func_svid_putenv=yes,
@@ -34,7 +37,7 @@ AC_DEFUN([jm_FUNC_PUTENV],
   ])
   if test $jm_cv_func_svid_putenv = no; then
     AC_LIBOBJ(putenv)
-    AC_DEFINE_UNQUOTED(putenv, rpl_putenv,
+    AC_DEFINE(putenv, rpl_putenv,
       [Define to rpl_putenv if the replacement function should be used.])
   fi
 ])