generic: store package found definitions in config header

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

ConfigureChecks.cmake

@@ -15,8 +15,18 @@ include(CMakePushCheckState)
 # definitions like _GNU_SOURCE that are needed on each platform.
 set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
 
-kde4_bool_to_01(Libintl_FOUND HAVE_LIBINTL)            # kdecore
-kde4_bool_to_01(ACL_FOUND HAVE_POSIX_ACL)              # kio
+kde4_bool_to_01(Libintl_FOUND HAVE_LIBINTL)             # kdecore
+kde4_bool_to_01(DBUSMENUQT_FOUND HAVE_DBUSMENUQT)       # kdeui
+kde4_bool_to_01(LibArchive_FOUND HAVE_LIBARCHIVE)       # karchive
+kde4_bool_to_01(BZIP2_FOUND HAVE_BZIP2)                 # karchive
+kde4_bool_to_01(LIBLZMA_FOUND HAVE_LIBLZMA)             # karchive
+kde4_bool_to_01(AVAHI_FOUND HAVE_AVAHI)                 # kdnssd
+kde4_bool_to_01(EXIV2_FOUND HAVE_EXIV2)                 # kexiv2
+kde4_bool_to_01(LIBMICROHTTPD_FOUND HAVE_LIBMICROHTTPD) # khttp
+kde4_bool_to_01(MPV_FOUND HAVE_MPV)                     # kmediaplayer
+kde4_bool_to_01(OPENSSL_FOUND HAVE_OPENSSL)             # kpasswdstore
+kde4_bool_to_01(SPEECHD_FOUND HAVE_SPEECHD)             # kspeech
+kde4_bool_to_01(ACL_FOUND HAVE_POSIX_ACL)               # kio
 
 check_include_files(fstab.h       HAVE_FSTAB_H)                        # kio, kdecore
 check_include_files(mntent.h      HAVE_MNTENT_H)                       # solid, kio, kdecore

config.h.cmake

@@ -41,6 +41,36 @@
 /* Define to 1 if you have libintl */
 #cmakedefine HAVE_LIBINTL 1
 
+/* Define to 1 if you have DBusMenuQt */
+#cmakedefine HAVE_DBUSMENUQT 1
+
+/* Define to 1 if you have libarchive */
+#cmakedefine HAVE_LIBARCHIVE 1
+
+/* Define to 1 if you have BZip2 */
+#cmakedefine HAVE_BZIP2 1
+
+/* Define to 1 if you have XZ Utils */
+#cmakedefine HAVE_LIBLZMA 1
+
+/* Define to 1 if you have Avahi */
+#cmakedefine HAVE_AVAHI 1
+
+/* Define to 1 if you have Exiv2 */
+#cmakedefine HAVE_EXIV2 1
+
+/* Define to 1 if you have Libmicrohttpd */
+#cmakedefine HAVE_LIBMICROHTTPD 1
+
+/* Define to 1 if you have MPV */
+#cmakedefine HAVE_MPV 1
+
+/* Define to 1 if you have OpenSSL */
+#cmakedefine HAVE_OPENSSL 1
+
+/* Define to 1 if you have Speech Dispatcher */
+#cmakedefine HAVE_SPEECHD 1
+
 /* Define to 1 if getmntinfo() uses statvfs struct */
 #cmakedefine GETMNTINFO_USES_STATVFS 1
 

kdeui/CMakeLists.txt

@@ -261,8 +261,6 @@ set(kdeui_LIB_SRCS
 )
 
 if(DBUSMENUQT_FOUND)
-    add_definitions(-DHAVE_DBUSMENUQT)
-
     include_directories(${DBUSMENUQT_INCLUDE_DIR})
 
     set(KDEUI_EXTRA_LIBS

kdeui/notifications/kstatusnotifieritem.cpp

@@ -18,6 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "kstatusnotifieritem.h"
 #include "kstatusnotifieritemprivate_p.h"
 #include "kstatusnotifieritemdbus_p.h"

kutils/karchive/CMakeLists.txt

@@ -1,16 +1,13 @@
 if(LibArchive_FOUND)
     include_directories(${LibArchive_INCLUDE_DIRS})
-    add_definitions(-DHAVE_LIBARCHIVE)
 endif()
 
 if(BZIP2_FOUND)
     include_directories(${BZIP2_INCLUDE_DIR})
-    add_definitions(-DHAVE_BZIP2)
 endif()
 
 if(LIBLZMA_FOUND)
     include_directories(${LIBLZMA_INCLUDE_DIRS})
-    add_definitions(-DHAVE_LIBLZMA)
 endif()
 
 include_directories(${LIBDEFLATE_INCLUDES})

kutils/karchive/kcompressor.cpp

@@ -16,6 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "kcompressor.h"
 #include "klocale.h"
 #include "kmimetype.h"

kutils/karchive/kdecompressor.cpp

@@ -16,6 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "kdecompressor.h"
 #include "klocale.h"
 #include "kmimetype.h"

kutils/kdnssd/CMakeLists.txt

@@ -1,6 +1,5 @@
 if(AVAHI_FOUND)
     include_directories(${AVAHI_INCLUDE_DIR})
-    add_definitions(-DHAVE_AVAHI)
 endif()
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=51006)

kutils/kdnssd/kdnssd.cpp

@@ -16,6 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "kdnssd.h"
 #include "kurl.h"
 #include "kdebug.h"

kutils/kexiv2/CMakeLists.txt

@@ -1,6 +1,6 @@
 if(EXIV2_FOUND)
     include_directories(${EXIV2_INCLUDE_DIR})
-    add_definitions(-DHAVE_EXIV2 ${EXIV2_DEFINITIONS})
+    add_definitions(${EXIV2_DEFINITIONS})
 endif()
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=51003)

kutils/kexiv2/kexiv2.cpp

@@ -16,6 +16,7 @@
     Boston, MA 02110-1301, USA.
 */ 
 
+#include "config.h"
 #include "kexiv2.h"
 #include "kdebug.h"
 

kutils/khttp/CMakeLists.txt

@@ -1,6 +1,5 @@
 if(LIBMICROHTTPD_FOUND)
     include_directories(${LIBMICROHTTPD_INCLUDE_DIR})
-    add_definitions(-DHAVE_LIBMICROHTTPD)
 endif()
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=51007)

kutils/khttp/khttp.cpp

@@ -16,6 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "khttp.h"
 #include "kdebug.h"
 #include "kde_file.h"

kutils/kmediaplayer/CMakeLists.txt

@@ -1,6 +1,5 @@
 if(MPV_FOUND)
     include_directories(${MPV_INCLUDES})
-    add_definitions(-DHAVE_MPV)
 endif()
 
 # for the kded module

kutils/kmediaplayer/kmediaplayer.cpp

@@ -16,6 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "kdebug.h"
 #include "klocale.h"
 #include "ksettings.h"

kutils/kpasswdstore/CMakeLists.txt

@@ -1,6 +1,5 @@
 if(OPENSSL_FOUND)
     include_directories(${OPENSSL_INCLUDE_DIR})
-    add_definitions(-DHAVE_OPENSSL)
 endif()
 
 # for the kded module

kutils/kpasswdstore/kded/kpasswdstoreimpl.h

@@ -19,6 +19,7 @@
 #ifndef KPASSWDSTOREIMPL_H
 #define KPASSWDSTOREIMPL_H
 
+#include "config.h"
 #include "kpasswdstore_export.h"
 
 #include <QString>

kutils/kspeech/CMakeLists.txt

@@ -1,6 +1,5 @@
 if(SPEECHD_FOUND)
     include_directories(${SPEECHD_INCLUDE_DIR})
-    add_definitions(-DHAVE_SPEECHD)
 endif()
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=51008)

kutils/kspeech/kspeech.cpp

@@ -16,6 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "kspeech.h"
 
 #include <QMutex>