X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=cmakeconfig.h.in;h=4a32408945a0a3bb157f37586018fe30694bd46a;hp=2b4048a08dd1b0edcfcc713bf7df2d5d7df84b7e;hb=e5cd75557872597182820c22ea581e9640eb5ef4;hpb=aca55a29f7b982e7a0bd9911d1d176561c8d7a84 diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 2b4048a08d..4a32408945 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -1,5 +1,8 @@ /* cmakeconfig.h.in */ +#ifndef __CONFIG_H__ +#define __CONFIG_H__ + /* Note: You cannot use earlier #defines in later #cmakedefines (cmake 2.6.2). */ /* Name of package */ @@ -13,6 +16,7 @@ #define VERSION_MINOR ${PROJECT_MINOR_VERSION} #define VERSION_MICRO ${PROJECT_PATCH_VERSION} +#define VERSION_RELEASE "${PROJECT_RELEASE_VERSION}" #define VERSION_FLAVOR "${VERSION_FLAVOR}" /* FIXME: Move the path stuff to the CMakeInstallDirs.cmake file */ @@ -22,66 +26,63 @@ /* 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 extcap */ -#cmakedefine HAVE_EXTCAP 1 - /* Define to 1 if we want to enable plugins */ #cmakedefine HAVE_PLUGINS 1 /* Define to 1 if we check hf conflict */ #cmakedefine ENABLE_CHECK_FILTER 1 -/* Link plugins statically into Wireshark */ +/* Link Wireshark libraries statically */ #cmakedefine ENABLE_STATIC 1 /* Enable AirPcap */ #cmakedefine HAVE_AIRPCAP 1 +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_ALLOCA_H 1 + /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ARPA_INET_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_ARPA_NAMESER_H 1 - /* Define to 1 if you have the `bpf_image' function. */ #cmakedefine HAVE_BPF_IMAGE 1 /* 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 header file. */ -#cmakedefine HAVE_DLFCN_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_FCNTL_H 1 -/* Define to use GeoIP library */ -#cmakedefine HAVE_GEOIP 1 - -/* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */ -#cmakedefine HAVE_GEOIP_V6 1 - -/* Define if GeoIP has GeoIP_free (not available upstream with 1.6.10 or earlier) */ -#cmakedefine HAVE_GEOIP_FREE 1 +/* Define to use the MaxMind DB library */ +#cmakedefine HAVE_MAXMINDDB 1 /* Define to 1 if you have the 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 @@ -94,33 +95,15 @@ /* Define to 1 if you have the 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 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_GRP_H 1 /* Define to use heimdal kerberos */ #cmakedefine HAVE_HEIMDAL_KERBEROS 1 -/* Define to 1 if you have the `inet_aton' function. */ -#cmakedefine HAVE_INET_ATON 1 - -/* Define to 1 if you have the `inet_ntop' function. */ -#cmakedefine HAVE_INET_NTOP 1 - -/* Define to 1 if you have the `inet_pton' function. */ -#cmakedefine HAVE_INET_PTON 1 - /* Define to 1 if you have the `inflatePrime' function. */ #cmakedefine HAVE_INFLATEPRIME 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_INTTYPES_H 1 - /* Define to 1 if you have the `issetugid' function. */ #cmakedefine HAVE_ISSETUGID 1 @@ -151,9 +134,6 @@ /* Define to use libpcap library */ #cmakedefine HAVE_LIBPCAP 1 -/* Define to use libportaudio library */ -#cmakedefine HAVE_LIBPORTAUDIO 1 - /* Define to 1 if you have the `smi' library (-lsmi). */ #cmakedefine HAVE_LIBSMI 1 @@ -163,6 +143,9 @@ /* Define to use lz4 library */ #cmakedefine HAVE_LZ4 1 +/* Check for lz4frame */ +#cmakedefine HAVE_LZ4FRAME_H 1 + /* Define to use snappy library */ #cmakedefine HAVE_SNAPPY 1 @@ -184,9 +167,6 @@ /* Define to use MIT kerberos */ #cmakedefine HAVE_MIT_KERBEROS 1 -/* Define to 1 if you have the `mkdtemp' function. */ -#cmakedefine HAVE_MKDTEMP 1 - /* Define to 1 if you have the `mkstemps' function. */ #cmakedefine HAVE_MKSTEMPS 1 @@ -214,9 +194,6 @@ /* VHT_CAPABILITY is supported */ #cmakedefine HAVE_NL80211_VHT_CAPABILITY 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_NTDDNDIS_H 1 - /* Define to 1 if you have macOS frameworks */ #cmakedefine HAVE_MACOS_FRAMEWORKS 1 @@ -281,12 +258,6 @@ /* Define to 1 if you have the `pcap_set_tstamp_type' function. */ #cmakedefine HAVE_PCAP_SET_TSTAMP_TYPE 1 -/* Define to 1 if you have the popcount function. */ -#cmakedefine HAVE_POPCOUNT 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_PORTAUDIO_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_PWD_H 1 @@ -317,12 +288,6 @@ /* Define to 1 if you have the WinSparkle library */ #cmakedefine HAVE_SOFTWARE_UPDATE 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRINGS_H 1 - /* Define if you have the 'strptime' function. */ #cmakedefine HAVE_STRPTIME 1 @@ -335,30 +300,18 @@ /* Define to 1 if `__st_birthtime' is a member of `struct stat'. */ #cmakedefine HAVE_STRUCT_STAT___ST_BIRTHTIME 1 -/* Define to 1 if you have the `sysconf' function. */ -#cmakedefine HAVE_SYSCONF 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_IOCTL_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_PARAM_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_SOCKET_H 1 /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_SOCKIO_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STAT_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_TIME_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TYPES_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_UTSNAME_H 1 @@ -374,12 +327,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_WINDOWS_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_WINSOCK2_H 1 - /* Name of package */ #cmakedefine PACKAGE @@ -398,15 +345,9 @@ /* Define to the version of this package. */ #cmakedefine PACKAGE_VERSION -/* Support for pcap-ng */ +/* Support for pcapng */ #cmakedefine PCAP_NG_DEFAULT 1 -/* Plugin installation directory */ -#cmakedefine PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}" - -/* Define if we are using version of of the Portaudio library API */ -#cmakedefine PORTAUDIO_API_1 1 - /* Define if we have QtMultimedia */ #cmakedefine QT_MULTIMEDIA_LIB 1 @@ -416,13 +357,6 @@ /* 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 @@ -437,14 +371,23 @@ /* 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} - -/* Hint to the compiler that a function never returns */ -#define WS_NORETURN @WS_NORETURN@ - #if defined(_WIN32) + /* + * Make sure everyone is using the same API and that it's sufficient + * for our needs. + * This should match the following: + * - The section in image\wireshark.exe.manifest.in + * - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi + * - The VersionNT parts of packaging\wix\Prerequisites.wxi + */ +# if defined(NTDDI_VERSION) +# error NTDDI_VERSION already defined. +# endif +# define NTDDI_VERSION NTDDI_WIN7 +# if defined(_WIN32_WINNT) +# error _WIN32_WINNT already defined. +# endif +# define _WIN32_WINNT _WIN32_WINNT_WIN7 /* WpdPack/INclude/pcap/pcap.h checks for "#if defined(WIN32)" */ # ifndef WIN32 @@ -455,22 +398,11 @@ typedef int ssize_t; # endif - /* FIXME: Detection doesn't work */ -# define HAVE_NTDDNDIS_H 1 - /* Visual C 9 (2008), Visual C 10 (2010), Visual C 11 (2012) and Visual C 12 (2013) - * need these prototypes - * XXX: Can we use MSC_VER >= 1500 ?? */ -# if _MSC_VER == 1500 || _MSC_VER == 1600 || _MSC_VER == 1700 || _MSC_VER == 1800 -# define NTDDI_VERSION NTDDI_WINXPSP3 -# define _WIN32_WINNT _WIN32_WINNT_WINXP -# endif - /* * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h */ # define YY_NO_UNISTD_H - # define strncasecmp strnicmp # define popen _popen # define pclose _pclose @@ -486,3 +418,5 @@ #endif #include + +#endif /* __CONFIG_H__ */