X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fputenv.m4;h=d79321be9c2b2ce79ae0edc1edcf97450f101c9e;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=ba7c5c743480594bbce2421c3f917f2c772ccdcb;hpb=2de77d6200b862971181d66a52de3d434ff7f47b;p=gnulib.git

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index ba7c5c743..d79321be9 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,5 +1,5 @@
-# putenv.m4 serial 13
-dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
+# putenv.m4 serial 20
+dnl Copyright (C) 2002-2014 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.
@@ -12,29 +12,45 @@ dnl The putenv in libc on at least SunOS 4.1.4 does *not* do that.
 AC_DEFUN([gl_FUNC_PUTENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
-   [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  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"))
-      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.
+             [case "$host_os" in
+                        # Guess yes on glibc systems.
+                *-gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
+                        # If we don't know, assume the worst.
+                *)      gl_cv_func_svid_putenv="guessing no" ;;
+              esac
+             ])
    ])
-  if test $jm_cv_func_svid_putenv = no; then
-    REPLACE_PUTENV=1
-    AC_LIBOBJ(putenv)
-  fi
+  case "$gl_cv_func_svid_putenv" in
+    *yes) ;;
+    *)
+      REPLACE_PUTENV=1
+      ;;
+  esac
+])
+
+# Prerequisites of lib/putenv.c.
+AC_DEFUN([gl_PREREQ_PUTENV],
+[
+  AC_CHECK_DECLS([_putenv])
 ])