[Emacs-diffs] master 6ef1434: Don't require GNU putenv

[Paul Eggert]

branch: master
commit 6ef14349fa73922473ba8202e256f20e17661b25
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Don't require GNU putenv
    
    * configure.ac: Use system putenv even if it lacks GNU features, as
    we don't need them.  This works around a bug in FreeBSD 10.1 getenv.
    Fixes: bug#19874
---
 ChangeLog    |    7 +++++++
 configure.ac |    5 +++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47ef578..0bfdfbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-27  Paul Eggert  <address@hidden>
+
+       Don't require GNU putenv
+       * configure.ac: Use system putenv even if it lacks GNU features, as
+       we don't need them.  This works around a bug in FreeBSD 10.1 getenv.
+       Fixes: bug#19874
+
 2015-02-25  Paul Eggert  <address@hidden>
 
        Merge from gnulib
diff --git a/configure.ac b/configure.ac
index 0bcc55c..e7408f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -780,6 +780,11 @@ AC_DEFUN([gl_CRYPTO_CHECK])
 # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW,
 # as we don't use them.
 AC_DEFUN([gl_FCNTL_O_FLAGS])
+# Use the system putenv even if it lacks GNU features, as we don't need them,
+# and the gnulib replacement runs afoul of a FreeBSD 10.1 bug; see Bug#19874.
+AC_CHECK_FUNCS_ONCE([putenv])
+AC_DEFUN([gl_FUNC_PUTENV],
+  [test "$ac_cv_func_putenv" = yes || REPLACE_PUTENV=1])
 
 # Initialize gnulib right after choosing the compiler.
 dnl Amongst other things, this sets AR and ARFLAGS.