If the user enables gtk3, (silently) disable gtk2 rather than forcing the user

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

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index dc12509a0162c5016e9b0d983b4cf5f7a1f6b9b7..2b8e9a988ab27af6fb5333a0150471fce68911b2 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -7,6 +7,9 @@
 
 /* Version number of package */
 #define VERSION "${CPACK_PACKAGE_VERSION}"
+#define VERSION_MAJOR "${PROJECT_MAJOR_VERSION}"
+#define VERSION_MINOR "${PROJECT_MINOR_VERSION}"
+#define VERSION_MICRO "${PROJECT_PATCH_VERSION}"
 
 /* FIXME: Move the path stuff to the CMakeInstallDirs.cmake file */
 /* Directory for data */
@@ -18,9 +21,6 @@
 /* Directory where plugins reside */
 #define PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}"
 
-/* Define to 1 if we want to use threads in wireshark and dumpcap */
-#cmakedefine USE_THREADS 1
-
 /* Define to 1 if we want to use pcap-ng as our default file format */
 #cmakedefine PCAP_NG_DEFAULT 1
 
@@ -49,7 +49,7 @@
 #cmakedefine HAVE_FCNTL_H 1
 
 /* Define to 1 if you have the <getopt.h> header file. */
-#cmakedefine HAVE_GETOPT_H 1
+#cmakedefine HAVE_GETOPT 1
 
 /* Define to 1 if you have the `chown' function. */
 #cmakedefine HAVE_CHOWN 1
@@ -63,6 +63,18 @@
 /* Define to use the airpcap library */
 #cmakedefine HAVE_AIRPCAP 1
 
+/* Define to use the libnl library */
+#cmakedefine HAVE_LIBNL 1
+
+/* Define to use the libnl library */
+#cmakedefine HAVE_LIBNL1 1
+
+/* Define to use the libnl library */
+#cmakedefine HAVE_LIBNL2 1
+
+/* Define to use the libnl library */
+#cmakedefine HAVE_LIBNL3 1
+
 /* Define to use C ares library */
 #cmakedefine HAVE_C_ARES 1
 
@@ -72,6 +84,9 @@
 /* Define to use GEOIP library */
 #cmakedefine HAVE_GEOIP 1
 
+/* Define if GEOIP library supports IPv6 (GeoIP 1.4.5 and later) */
+#cmakedefine HAVE_GEOIP_V6 1
+
 /* Define to use capabilities library */
 #cmakedefine HAVE_LIBCAP 1
 
@@ -108,9 +123,6 @@
 /* Define to use libpcap library */
 #cmakedefine HAVE_LIBPCAP 1
 
-/* Define to use libpcre library */
-#cmakedefine HAVE_LIBPCRE 1
-
 /* Define to use dbus-glib library */
 #cmakedefine HAVE_LIBDBUS 1
 
@@ -136,7 +148,7 @@
 #cmakedefine HAVE_LUALIB_H 1
 
 /* Define to use Lua 5.1 */
-#cmakedefine HAVE_LUA_5_1 1
+#cmakedefine HAVE_LUA 1
 
 /* Define to 1 if you have the <lua.h> header file. */
 #cmakedefine HAVE_LUA_H 1
@@ -221,9 +233,6 @@
 /* Define to 1 if you have the `pcap_open_dead' function. */
 #cmakedefine HAVE_PCAP_OPEN_DEAD 1
 
-/* Define to 1 if you have the `pcap_set_buffer_size' function. */
-#define HAVE_PCAP_SET_BUFFER_SIZE 1
-
 /* Define to 1 if you have the `pcap_set_datalink' function. */
 #cmakedefine HAVE_PCAP_SET_DATALINK 1
 
@@ -300,6 +309,12 @@
 /* Define to 1 if you have the <winsock2.h> header file. */
 #cmakedefine HAVE_WINSOCK2_H 1
 
+/* Define to 1 if tm_zone field exists in struct tm. */
+#cmakedefine HAVE_TM_ZONE 1
+
+/* Define to 1 if tzname array exists. */
+#cmakedefine HAVE_TZNAME 1
+
 /* HTML viewer, e.g. mozilla */
 #cmakedefine HTML_VIEWER
 
@@ -319,6 +334,12 @@
 /* Define if strptime.h needs to be included */
 #cmakedefine NEED_STRPTIME_H 1
 
+/* Define if linux/nl80211.h defines NL80211_CMD_SET_CHANNEL */
+#cmakedefine HAVE_NL80211_CMD_SET_CHANNEL 1
+
+/* Define if linux/nl80211.h is new enough */
+#cmakedefine HAVE_NL80211 1
+
 /* Name of package */
 #cmakedefine PACKAGE
 
@@ -357,10 +378,6 @@
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN 1
 
-/* Define as the string to precede external variable declarations in
-   dynamically-linked libraries */
-#define WS_VAR_IMPORT @WS_VAR_IMPORT@
-
 /* Define WS_MSVC_NORETURN appropriately for declarations of routines that
    never return (just like Charlie on the MTA).
 
@@ -374,3 +391,7 @@
    `char[]'. */
 /* Note: not use in the code */
 #cmakedefine YYTEXT_POINTER
+
+/* _U_ isn't needed for C++, simply don't name the variable.
+   However, we do need it for some headers that are shared between C and C++. */
+#define _U_ ${C_UNUSED}