X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=cmakeconfig.h.in;h=e90f512449fe98c50024096e54ebe0cb5add75de;hb=156515732a6d8b01e9926bff000021729f3b1ced;hp=b2b88291242f7573a448fa6f522ce63aeafec247;hpb=5b5ef967d2780b130cf010c7e9090357bc34af84;p=metze%2Fwireshark%2Fwip.git

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index b2b8829124..e90f512449 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -5,12 +5,16 @@
 /* Name of package */
 #define PACKAGE "wireshark"
 
+#define VERSION_EXTRA "$ENV{WIRESHARK_VERSION_EXTRA}"
+
 /* Version number of package */
-#define VERSION "${CPACK_PACKAGE_VERSION}"
+#define VERSION "${CPACK_PACKAGE_VERSION}${VERSION_EXTRA}"
 #define VERSION_MAJOR ${PROJECT_MAJOR_VERSION}
 #define VERSION_MINOR ${PROJECT_MINOR_VERSION}
 #define VERSION_MICRO ${PROJECT_PATCH_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}"
@@ -19,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
@@ -45,12 +49,6 @@
 /* Define to use c-ares library */
 #cmakedefine HAVE_C_ARES 1
 
-/* Define to 1 if you have the <direct.h> header file. */
-#cmakedefine HAVE_DIRECT_H 1
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#cmakedefine HAVE_DIRENT_H 1
-
 /* Define to 1 if you have the `dladdr' function. */
 #cmakedefine HAVE_DLADDR 1
 
@@ -66,15 +64,27 @@
 /* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */
 #cmakedefine HAVE_GEOIP_V6 1
 
+/* Define if you have the 'floorl' function. */
+#cmakedefine HAVE_FLOORL 1
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#cmakedefine HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `gethostbyname' function. */
+#cmakedefine HAVE_GETHOSTBYNAME 1
+
 /* Define to 1 if you have the `gethostbyname2' function. */
 #cmakedefine HAVE_GETHOSTBYNAME2 1
 
-/* Define to 1 if you have the getopt function. */
-#cmakedefine HAVE_GETOPT 1
+/* Define to 1 if you have the getopt_long function. */
+#cmakedefine HAVE_GETOPT_LONG 1
 
 /* Define to 1 if you have the <getopt.h> header file. */
 #cmakedefine HAVE_GETOPT_H 1
 
+/* Define if GLib's printf functions support thousands grouping. */
+#cmakedefine HAVE_GLIB_PRINTF_GROUPING 1
+
 /* Define to 1 if you have the `getprotobynumber' function. */
 #cmakedefine HAVE_GETPROTOBYNUMBER 1
 
@@ -141,6 +151,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
 
@@ -177,18 +193,27 @@
 /* SET_CHANNEL is supported */
 #cmakedefine HAVE_NL80211_CMD_SET_CHANNEL 1
 
+/* SPLIT_WIPHY_DUMP is supported */
+#cmakedefine HAVE_NL80211_SPLIT_WIPHY_DUMP 1
+
 /* Define to 1 if you have the <Ntddndis.h> header file. */
 #cmakedefine HAVE_NTDDNDIS_H 1
 
 /* Define to 1 if you have OS X frameworks */
 #cmakedefine HAVE_OS_X_FRAMEWORKS 1
 
+/* Define to 1 if you have the OS X CFPropertyListCreateWithStream function */
+#cmakedefine HAVE_CFPROPERTYLISTCREATEWITHSTREAM 1
+
 /* Define if pcap_breakloop is known */
 #cmakedefine HAVE_PCAP_BREAKLOOP 1
 
 /* Define to 1 if you have the `pcap_create' function. */
 #cmakedefine HAVE_PCAP_CREATE 1
 
+/* Define to 1 if the capture buffer size can be set. */
+#cmakedefine CAN_SET_CAPTURE_BUFFER_SIZE 1
+
 /* Define to 1 if you have the `pcap_datalink_name_to_val' function. */
 #cmakedefine HAVE_PCAP_DATALINK_NAME_TO_VAL 1
 
@@ -230,17 +255,23 @@
 /* Define to 1 if you have the `pcap_set_datalink' function. */
 #cmakedefine HAVE_PCAP_SET_DATALINK 1
 
-/* Define to 1 if you have the `pcap_setsampling" function. */
+/* Define to 1 if you have the `pcap_setsampling' function. */
 #cmakedefine HAVE_PCAP_SETSAMPLING 1
 
+/* Define to 1 if you have the `pcap_set_tstamp_precision' function. */
+#cmakedefine HAVE_PCAP_SET_TSTAMP_PRECISION 1
+
+/* Define to 1 if you have the popcount function. */
+#cmakedefine HAVE_POPCOUNT 1
+
 /* Define to 1 if you have the <portaudio.h> header file. */
 #cmakedefine HAVE_PORTAUDIO_H 1
 
 /* Define to 1 if you have the <pwd.h> header file. */
 #cmakedefine HAVE_PWD_H 1
 
-/* Define if python devel package available */
-#cmakedefine HAVE_PYTHON 1
+/* Define to 1 if you have the optreset variable */
+#cmakedefine HAVE_OPTRESET 1
 
 /* Define to 1 to enable remote capturing feature in WinPcap library */
 #cmakedefine HAVE_REMOTE 1
@@ -257,23 +288,17 @@
 /* Define to 1 if you have the `setresuid' function. */
 #cmakedefine HAVE_SETRESUID 1
 
-/* Define to 1 if you have the <stdarg.h> header file. */
-#cmakedefine HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#cmakedefine HAVE_STDDEF_H 1
+/* Define to 1 if you have the WinSparkle library */
+#cmakedefine HAVE_SOFTWARE_UPDATE 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine HAVE_STDINT_H 1
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H 1
-
 /* Define to 1 if you have the <strings.h> header file. */
 #cmakedefine HAVE_STRINGS_H 1
 
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H 1
+/* Define if you have the 'strptime' function. */
+#cmakedefine HAVE_STRPTIME 1
 
 /* Define if st_flags field exists in struct stat */
 #cmakedefine HAVE_ST_FLAGS 1
@@ -329,9 +354,6 @@
 /* Define if inet/v6defs.h needs to be included */
 #cmakedefine NEED_INET_V6DEFS_H 1
 
-/* Define if strptime.h needs to be included */
-#cmakedefine NEED_STRPTIME_H 1
-
 /* Name of package */
 #cmakedefine PACKAGE
 
@@ -359,16 +381,25 @@
 /* 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 QtMacExtras */
 #cmakedefine QT_MACEXTRAS_LIB 1
 
 /* Define if we have QtWinExtras */
 /* #cmakedefine QT_WINEXTRAS_LIB 1 */
 
+/* Support for packet editor */
+#cmakedefine WANT_PACKET_EDITOR 1
+
 /* Define to 1 if your processor stores words with the most significant byte
    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
@@ -393,7 +424,14 @@
    However, we do need it for some headers that are shared between C and C++. */
 #define _U_ ${C_UNUSED}
 
-#  define INET6 1
+/* We don't bother checking for IPv6 support; the checks done in the
+   autoconf script are relics of a bygone age, where IPv6 support in
+   OSes was sometimes present by default, sometimes provided by
+   third-party add-ons, and sometimes completely absent, and where the
+   particular flavor of IPv6 support mattered to us.  We'll just wire it
+   on, unless and until that becomes an issue on platforms where people
+   use CMake. */
+#define INET6 1
 
 #if defined(_WIN32)
 
@@ -433,7 +471,6 @@
 #  define UNICODE 1
 #  define _UNICODE 1
 
-/*#  define INET6 1*/
 #  define NEED_INET_V6DEFS_H 1
 #  define NEED_STRPTIME_H 1
 #endif