Adding upstream version 4.4.0.upstream/4.4.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 21 insertions, 2 deletions

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 5afe3a89..e64e9e85 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -103,6 +103,9 @@
 /* Define to 1 if you have the `inflatePrime' function. */
 #cmakedefine HAVE_INFLATEPRIME 1
 
+/* Define to 1 if you have the `zng_gzopen' function. */
+#cmakedefine WITH_GZFILEOP 1
+
 /* Define to 1 if you have the `issetugid' function. */
 #cmakedefine HAVE_ISSETUGID 1
 
@@ -148,8 +151,17 @@
 /* Define to use zlib library */
 #cmakedefine HAVE_ZLIB 1
 
+/* Define to use zlib-ng library */
+#cmakedefine HAVE_ZLIBNG 1
+#define ZLIBNG_VERSION_STRING "${ZLIBNG_VERSION_STRING}"
+
 /* Define to use the minizip library */
 #cmakedefine HAVE_MINIZIP 1
+#define MINIZIP_VERSION "${MINIZIP_VERSION}"
+
+/* Define to use the minizip-ng library */
+#cmakedefine HAVE_MINIZIPNG 1
+#define MINIZIPNG_VERSION "${MINIZIPNG_VERSION}"
 
 /* Define if `dos_date' (with underscore) field exists in `zip_fileinfo'  */
 #cmakedefine HAVE_MZCOMPAT_DOS_DATE 1
@@ -181,6 +193,9 @@
 /* Define to 1 if we have Lua with Unicode for Windows patches. */
 #cmakedefine HAVE_LUA_UNICODE 1
 
+/* The size of the lua_Integer type, if we have Lua. */
+#cmakedefine LUA_INTEGER_SIZE ${LUA_INTEGER_SIZE}
+
 /* Define to use MIT kerberos */
 #cmakedefine HAVE_MIT_KERBEROS 1
 
@@ -280,6 +295,9 @@
 /* Define if you have the 'memmem' function. */
 #cmakedefine HAVE_MEMMEM 1
 
+/* Define if you have the 'memrchr' function. */
+#cmakedefine HAVE_MEMRCHR 1
+
 /* Define if you have the 'strerrorname_np' function. */
 #cmakedefine HAVE_STRERRORNAME_NP 1
 
@@ -322,6 +340,9 @@
 /* Define if we have QtMultimedia */
 #cmakedefine QT_MULTIMEDIA_LIB 1
 
+/* Define if we have QtDBus */
+#cmakedefine QT_DBUS_LIB 1
+
 /* Build androiddump with libpcap instead of wireshark stuff */
 #cmakedefine ANDROIDDUMP_USE_LIBPCAP 1
 
@@ -361,12 +382,10 @@
  * - The VersionNT parts of packaging\wix\Prerequisites.wxi
  */
 #  ifndef NTDDI_VERSION
-// #  define NTDDI_VERSION   NTDDI_WIN7
 #  define NTDDI_VERSION   NTDDI_WIN10
 #  endif
 
 #  ifndef _WIN32_WINNT
-// #  define _WIN32_WINNT    _WIN32_WINNT_WIN7
 #  define _WIN32_WINNT    _WIN32_WINNT_WIN10
 #  endif
 #endif