diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-06-05 19:09:11 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-06-05 19:09:11 +0200 |
commit | 398220fa033091b34ddb80723f379ffe701fc052 (patch) | |
tree | cac2c192e3c63cdd19111f45a8fc6da2db38fcd6 /gl/m4/putenv.m4 | |
parent | e0fc4ac94721ec49044927bdadcc843e881e4c22 (diff) | |
download | gnutls-8428bcee8d96090f68043287f2793ed0d371f12b.tar.gz |
updated gnulibgnutls_3_0_20
Diffstat (limited to 'gl/m4/putenv.m4')
-rw-r--r-- | gl/m4/putenv.m4 | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gl/m4/putenv.m4 b/gl/m4/putenv.m4 index 1cb23a594f..b971b1204d 100644 --- a/gl/m4/putenv.m4 +++ b/gl/m4/putenv.m4 @@ -1,4 +1,4 @@ -# putenv.m4 serial 18 +# putenv.m4 serial 19 dnl Copyright (C) 2002-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,6 +12,7 @@ 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_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],[[ @@ -32,9 +33,18 @@ AC_DEFUN([gl_FUNC_PUTENV], 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) + [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 $gl_cv_func_svid_putenv = no; then - REPLACE_PUTENV=1 - fi + case "$gl_cv_func_svid_putenv" in + *yes) ;; + *) + REPLACE_PUTENV=1 + ;; + esac ]) |