getaddrinfo: Doc fix.

[pspp] / m4 / putenv.m4

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 0c4aebf4a71f365ad976c52008a3e80aed47bede..de3900bf282cf04805bbe72152df33ffd600d44c 100644 (file)
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,44 +1,41 @@
-#serial 1
+# putenv.m4 serial 17
+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.
 
 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
-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
 
-AC_DEFUN(jm_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_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],[[
+    /* 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 2;
 
-      /* Make sure it was deleted.  */
-      if (getenv ("CONFTEST_putenv") != 0)
-        exit (1);
+    /* Make sure it was deleted.  */
+    if (getenv ("CONFTEST_putenv") != 0)
+      return 3;
 
-      exit (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)
-  ])
-  if test $jm_cv_func_svid_putenv = no; then
-    LIBOBJS="$LIBOBJS putenv.o"
-    AC_DEFINE_UNQUOTED(putenv, rpl_putenv)
+    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)
+   ])
+  if test $gl_cv_func_svid_putenv = no; then
+    REPLACE_PUTENV=1
+    AC_LIBOBJ([putenv])
   fi
 ])