wmem: allow wmem_destroy_list to ignore a NULL list.

[metze/wireshark/wip.git] / cmakeconfig.h.in

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 2c7ba5c75eb59ca4d1b7c82ebfe86f3c77691f78..d1fe80588078162fea1db77befde0a3a840a252c 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -19,16 +19,9 @@
 #define VERSION_RELEASE "${PROJECT_RELEASE_VERSION}"
 #define VERSION_FLAVOR "${VERSION_FLAVOR}"
 
-/* FIXME: Move the path stuff to the CMakeInstallDirs.cmake file */
-/* Directory for data */
-#define DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}"
-
 /* Build wsutil with SIMD optimization */
 #cmakedefine HAVE_SSE4_2 1
 
-/* Directory where extcap hooks reside */
-#define EXTCAP_DIR "${EXTCAP_DIR}"
-
 /* Define to 1 if we want to enable plugins */
 #cmakedefine HAVE_PLUGINS 1
 
@@ -53,9 +46,6 @@
 /* Define to use c-ares library */
 #cmakedefine HAVE_C_ARES 1
 
-/* Define to 1 if you have the `dladdr' function. */
-#cmakedefine HAVE_DLADDR 1
-
 /* Define to 1 if you have the <fcntl.h> header file. */
 #cmakedefine HAVE_FCNTL_H 1
 
@@ -65,18 +55,27 @@
 /* Define to 1 if you have the <ifaddrs.h> header file. */
 #cmakedefine HAVE_IFADDRS_H 1
 
+/* Define to 1 if yu have the `fseeko` function. */
+#cmakedefine HAVE_FSEEKO 1
+
+/* Define to 1 if you have the `getexecname' function. */
+#cmakedefine HAVE_GETEXECNAME 1
+
 /* Define to 1 if you have the `getifaddrs' function. */
 #cmakedefine HAVE_GETIFADDRS 1
 
 /* Define if LIBSSH support is enabled */
 #cmakedefine HAVE_LIBSSH 1
 
-/* Define if JSONGLIB support is enabled */
-#cmakedefine HAVE_JSONGLIB 1
-
 /* Define if LIBSSH has ssh_userauth_agent() function */
 #cmakedefine HAVE_SSH_USERAUTH_AGENT 1
 
+/* Define if you have the 'dlget' function. */
+#cmakedefine HAVE_DLGET 1
+
+/* Define if you have the 'getexecname' function. */
+#cmakedefine HAVE_GETEXECNAME 1
+
 /* Define if you have the 'floorl' function. */
 #cmakedefine HAVE_FLOORL 1
 
@@ -113,6 +112,9 @@
 /* Define to use GnuTLS library */
 #cmakedefine HAVE_LIBGNUTLS 1
 
+/* Define to 1 if GnuTLS was built with pkcs11 support. */
+#cmakedefine HAVE_GNUTLS_PKCS11 1
+
 /* Enable libnl support */
 #cmakedefine HAVE_LIBNL 1
 
@@ -303,15 +305,9 @@
 /* Define to 1 if you have the <sys/sockio.h> header file. */
 #cmakedefine HAVE_SYS_SOCKIO_H 1
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H 1
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #cmakedefine HAVE_SYS_TIME_H 1
 
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H 1
-
 /* Define to 1 if you have the <sys/utsname.h> header file. */
 #cmakedefine HAVE_SYS_UTSNAME_H 1
 
@@ -349,14 +345,11 @@
 #cmakedefine PCAP_NG_DEFAULT 1
 
 /* Define if we have QtMultimedia */
-#cmakedefine QT_MULTIMEDIA_LIB 1
+#define QT_MULTIMEDIA_LIB 1
 
 /* Define if we have QtMacExtras */
 #cmakedefine QT_MACEXTRAS_LIB 1
 
-/* Define if we have QtWinExtras */
-/* #cmakedefine QT_WINEXTRAS_LIB 1 */
-
 /* Build androiddump with libpcap instead of wireshark stuff */
 #cmakedefine ANDROIDDUMP_USE_LIBPCAP 1