diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-01-20 10:55:18 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-01-20 10:55:18 +0000 |
| commit | 70e9163c9c18e995515598085cb824e554eb7ae7 (patch) | |
| tree | a42dc8b2a6c031354bf31472de888bfc8a060132 /m4/putenv.m4 | |
| parent | cbf5993c43f49281173f185863577d86bfac6eae (diff) | |
| download | coreutils-tarball-70e9163c9c18e995515598085cb824e554eb7ae7.tar.gz | |
coreutils-8.25HEADcoreutils-8.25master
Diffstat (limited to 'm4/putenv.m4')
| -rw-r--r-- | m4/putenv.m4 | 51 |
1 files changed, 34 insertions, 17 deletions
diff --git a/m4/putenv.m4 b/m4/putenv.m4 index 43a5dc5..c3c30d8 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ -# putenv.m4 serial 12 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# putenv.m4 serial 20 +dnl Copyright (C) 2002-2016 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. @@ -10,30 +10,47 @@ 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. AC_DEFUN([gl_FUNC_PUTENV], -[AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv, - [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[ +[ + 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],[[ /* 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) - ]) - if test $jm_cv_func_svid_putenv = no; then - AC_LIBOBJ(putenv) - AC_DEFINE(putenv, rpl_putenv, - [Define to rpl_putenv if the replacement function should be used.]) - fi + ]])], + 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 + ]) + ]) + 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]) ]) |