From: Alex Richardson <arichardson.kde@gmail.com>
Date: Sat, 19 Mar 2022 14:48:04 +0000 (+0000)
Subject: Revert "Fix gcc compile error: redundant redeclaration of ‘environ’ [-Werror=redundan... 
X-Git-Tag: dbus-1.15.0~90^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4dbde9fc5bb217fe279b162195961552837fcca;p=thirdparty%2Fdbus.git

Revert "Fix gcc compile error: redundant redeclaration of ‘environ’ [-Werror=redundant-decls]"

Breaks the build on FreeBSD which doens't have an environ declaration.
The CMake check_symbol_exists call sets `HAVE_DECL_ENVIRON` to an empty
variable (which means if(DEFINED) suceeds). This normalization should not
be necessary as it will be handled correctly by `#cmakedefine01`. If not,
all the other HAVE_* defines would also be wrong.

This reverts commit e8b34b419e44e0b95622f45c0f17487e241b1961.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 210e5311a..66590792c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -625,11 +625,6 @@ set(DBUS_DAEMON_NAME "dbus-daemon" CACHE STRING "The name of the dbus daemon exe
 
 #include(ConfigureChecks.cmake)
 
-# only defined but expected as boolean
-if(DEFINED HAVE_DECL_ENVIRON)
-    set(HAVE_DECL_ENVIRON 1)
-endif()
-
 # compiler definitions
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(${DBUS_BUS_CFLAGS})