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 77adf31a55daf38de4aac11d3b8b7f05e6d176eb..d1fe80588078162fea1db77befde0a3a840a252c 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -19,10 +19,6 @@
 #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
 
@@ -116,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
 
@@ -346,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