gnucash maint: Remove configuration of HAVE_PUTENV.

John Ralls jralls at code.gnucash.org
Sun Oct 16 06:09:28 EDT 2016


Updated	 via  https://github.com/Gnucash/gnucash/commit/c68452a4 (commit)
	from  https://github.com/Gnucash/gnucash/commit/38e6d7f7 (commit)



commit c68452a497ce707c662df2efc5bef9ef9123a6ce
Author: Rob.Gowin <robgowin at gmail.com>
Date:   Fri Oct 14 14:17:04 2016 -0500

    Remove configuration of HAVE_PUTENV.
    
    The Python includes files for Windows define HAVE_PUTENV to be
    empty. GnuCash under MINGW (only) defines it to be 1. This causes
    redefinition errors when building the Python bindings on Windows.
    HAVE_PUTENV is not used in the GnuCash code base, so the best
    solution seems to be to just get rid of it.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1465093..a4397c0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,10 +13,6 @@ IF (WIN32)
   SET (HAVE_HTMLHELPW 1)
 ENDIF (WIN32)
 
-IF (MINGW)
-  SET (HAVE_PUTENV 1)
-ENDIF (MINGW)
-
 CHECK_INCLUDE_FILES (X11/Xlib.h HAVE_X11_XLIB_H)
 CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
 CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in
index 2c85bc4..0d0334b 100644
--- a/src/config.h.cmake.in
+++ b/src/config.h.cmake.in
@@ -197,9 +197,6 @@
 /* Have PTHREAD_PRIO_INHERIT. */
 #cmakedefine HAVE_PTHREAD_PRIO_INHERIT 1
 
-/* Define to 1 if you have the `putenv' function. */
-#cmakedefine HAVE_PUTENV 1
-
 /* If available, contains the Python version number currently in use. */
 #cmakedefine HAVE_PYTHON 1
 



Summary of changes:
 src/CMakeLists.txt    | 4 ----
 src/config.h.cmake.in | 3 ---
 2 files changed, 7 deletions(-)



More information about the gnucash-changes mailing list