diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-10-22 16:24:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-10-22 16:24:32 +0200 |
| commit | 35428fb6b2d269dbfa2eec7d0739aec149bd4cc2 (patch) | |
| tree | 03146c5871ad9b2167f3dffc89fdbb3082d7fc4e /m4/environ.m4 | |
| parent | fe4ea6859e7d19a0fe2694a3fb49f4abb722afc1 (diff) | |
| download | guile-35428fb6b2d269dbfa2eec7d0739aec149bd4cc2.tar.gz | |
Update Gnulib to v0.0-6523-gb3609c1.
Diffstat (limited to 'm4/environ.m4')
| -rw-r--r-- | m4/environ.m4 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/m4/environ.m4 b/m4/environ.m4 index 7457ad139..6c7982f9b 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,4 +1,4 @@ -# environ.m4 serial 5 +# environ.m4 serial 6 dnl Copyright (C) 2001-2004, 2006-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, @@ -9,7 +9,16 @@ AC_DEFUN_ONCE([gl_ENVIRON], AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl Persuade glibc <unistd.h> to declare environ. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - gt_CHECK_VAR_DECL([#include <unistd.h>], environ) + + AC_CHECK_HEADERS_ONCE([unistd.h]) + gt_CHECK_VAR_DECL( + [#if HAVE_UNISTD_H + #include <unistd.h> + #endif + /* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>. */ + #include <stdlib.h> + ], + [environ]) if test $gt_cv_var_environ_declaration != yes; then HAVE_DECL_ENVIRON=0 fi |