From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 27 Feb 2015 08:04:39 +0000 (-0800)
Subject: Don't require GNU putenv
X-Git-Tag: emacs-25.0.90~2564^2~277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ef14349fa73922473ba8202e256f20e17661b25;p=emacs.git

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
---

diff --git a/ChangeLog b/ChangeLog
index 47ef578fb7c..0bfdfbbd8b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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  <eggert@cs.ucla.edu>
 
 	Merge from gnulib
diff --git a/configure.ac b/configure.ac
index 0bcc55c4c20..e7408f11ed4 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.