Move the definition of MAX_NUM_COLOR_CONVERSATION_COLORS.

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

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index b8e15177d3a912bffc38f86c9116bb2ee477cf49..dfc7e3290c18c7f8f47dba69812fafc547ea6492 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -23,7 +23,7 @@
 #cmakedefine HAVE_SSE4_2 1
 
 /* Directory where extcap hooks reside */
-#define EXTCAP_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/extcap/"
+#define EXTCAP_DIR "${EXTCAP_DIR}"
 
 /* Define to 1 if we want to enable extcap */
 #cmakedefine HAVE_EXTCAP 1
@@ -115,9 +115,6 @@
 /* Define to use kerberos */
 #cmakedefine HAVE_KERBEROS 1
 
-/* Define if krb5.h defines KEYTYPE_ARCFOUR_56 */
-#cmakedefine HAVE_KEYTYPE_ARCFOUR_56 1
-
 /* Define to use the libcap library */
 #cmakedefine HAVE_LIBCAP 1
 
@@ -151,6 +148,12 @@
 /* Define to use libz library */
 #cmakedefine HAVE_LIBZ 1
 
+/* Define to 1 if you have the <linux/sockios.h> header file. */
+#cmakedefine HAVE_LINUX_SOCKIOS_H 1
+
+/* Define to 1 if you have the <linux/if_bonding.h> header file. */
+#cmakedefine HAVE_LINUX_IF_BONDING_H 1
+
 /* Define to use Lua */
 #cmakedefine HAVE_LUA 1
 
@@ -375,8 +378,8 @@
 /* Define if we are using version of of the Portaudio library API */
 #cmakedefine PORTAUDIO_API_1 1
 
-/* Define if we have QtMultimediaWidgets */
-#cmakedefine QT_MULTIMEDIAWIDGETS_LIB 1
+/* Define if we have QtMultimedia */
+#cmakedefine QT_MULTIMEDIA_LIB 1
 
 /* Define if we have QtMacExtras */
 #cmakedefine QT_MACEXTRAS_LIB 1
@@ -391,6 +394,9 @@
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN 1
 
+/* Build androiddump with libpcap instead of wireshark stuff */
+#cmakedefine ANDROIDDUMP_USE_LIBPCAP 1
+
 /* Large file support */
 #cmakedefine _LARGEFILE_SOURCE
 #cmakedefine _LARGEFILE64_SOURCE