Commit Graph

106 Commits

Author SHA1 Message Date
Guy Harris 260a3af9b7 Check for bpf_image(), just as the autoconf script does.
svn path=/trunk/; revision=52514
2013-10-10 20:36:11 +00:00
Guy Harris ce17930dae HAVE_LUA is for Lua, not some particular version thereof.
Reorder to match config.h.in (which is autogenerated).

svn path=/trunk/; revision=52509
2013-10-10 20:14:12 +00:00
Guy Harris aeec217e18 Get rid of apparently-undefined and apparently-unused #defines.
svn path=/trunk/; revision=52508
2013-10-10 20:10:18 +00:00
Jörg Mayer 05908dea85 NEED_STRPTIME_H needs to be detected properly for windows.
Set it manually for now.

svn path=/trunk/; revision=52431
2013-10-07 00:21:23 +00:00
Jörg Mayer 0c25744c67 The code (at least) in dumpcap assumes that PCAP_CREATE is not
available on Windows - but we detect it in winpcap.

With this change dumpcap compiles and links


svn path=/trunk/; revision=52427
2013-10-06 22:17:24 +00:00
Jörg Mayer 0f8133c3f0 More copying of config.h.win32 stuff into cmake
svn path=/trunk/; revision=52419
2013-10-06 20:51:13 +00:00
Jörg Mayer db512010b3 Set some values for Windows manually where autodetection
does not yet work.

svn path=/trunk/; revision=52406
2013-10-06 16:11:50 +00:00
Jörg Mayer 29bcbc5515 (Hopefully) unbreak windows build (#define'ing to 0 is not
undefined).

svn path=/trunk/; revision=52387
2013-10-05 22:41:09 +00:00
Jörg Mayer 07a5c7442f Invert NEED_INET_ATON_H to HAVE_INET_ATON_H
Remove unused NEED_G_ASCII_STRTOULL_H

svn path=/trunk/; revision=52385
2013-10-05 21:56:23 +00:00
Jörg Mayer 30f0ea3846 ssize_t is missing on Windows, so typdef it.
svn path=/trunk/; revision=52370
2013-10-04 21:59:18 +00:00
Jörg Mayer bae2eee028 Implement in cmake:
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322

> User: guy
> Date: 2013/08/12 01:01 PM
>
> Log:
>  Just check whether dladdr() is available; we check in the code whether
>  it succeeds, so there's no point in checking whether it succeeds in a
>  sample program.

svn path=/trunk/; revision=51334
2013-08-13 09:58:09 +00:00
Jörg Mayer 812f308620 Use largefile detection in cmake.
Move wiretap/file_wrapper.c back to clean sources.

svn path=/trunk/; revision=50825
2013-07-23 09:41:35 +00:00
Martin Kaiser cc82d38c8b set HAVE_GETOPT_H and HAVE_GETOPT variables
for both autotools and cmake builds

(in order to use getopt_long(), we have to check if we
 can include getopt.h)

svn path=/trunk/; revision=50680
2013-07-16 21:12:12 +00:00
Jörg Mayer c5548e1077 Add HAVE_TM_ZONE and HAVE_TZNAME detection to fix timezone display
in cmake builds.

svn path=/trunk/; revision=48932
2013-04-19 16:38:28 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Evan Huus 97f5e101d9 Fix CMake build:
- add some new files to CMakeLists
- we do need _U_ for C++ now that we're sharing some headers between
  C and C++.

svn path=/trunk/; revision=45650
2012-10-18 22:20:36 +00:00
Jeff Morriss 5ee932193f *NIX (autofoo and cmake) part of the fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 :

Make VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO available in config.h so
(e.g.) dissector writers can #if around them as necessary to make a piece of
code compile with different versions of Wireshark.  (Hopefully VERSION_MICRO
is not important in this respect!)

Windows also defines VERSION_EXTRA which can be used to help identify custom
builds; this is not done for these build methods (yet?).

svn path=/trunk/; revision=44986
2012-09-18 21:42:13 +00:00
Jörg Mayer 8e66080f1d Copy over HAVE_NL80211 from autofoo
svn path=/trunk/; revision=44853
2012-09-10 20:24:51 +00:00
Jörg Mayer d8a7eed0a7 Get netlink detection working with cmake (not complete)
svn path=/trunk/; revision=44791
2012-09-06 10:37:17 +00:00
Anders Broman e6e6d6217b From Tony Trinh:
Update Lua from 5.1 to 5.2

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400

svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
Jörg Mayer c0da019caa Complete cmake support for netlink detection
svn path=/trunk/; revision=43421
2012-06-20 20:59:43 +00:00
Jörg Mayer 46e1e8643e Forgot to copy one more change
svn path=/trunk/; revision=43417
2012-06-20 19:03:27 +00:00
Jörg Mayer e64ba28e3b Do the changes to configure from r43354 in cmake as well.
Log:
 Start to have an generic wireless toolbar. Sligtly modified patch from
 Pontus Fuchs.

svn path=/trunk/; revision=43361
2012-06-19 14:21:08 +00:00
Jörg Mayer 137f3fc455 - Move setting _U_ into config.h, because
a) C++ has a standardized way of marking parameters as unused
  b) cmakes autoquoting magic failed when the compiler wasn't gcc
     but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
  as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project

svn path=/trunk/; revision=40807
2012-02-02 12:04:22 +00:00
Gerald Combs 7d442f4c22 Change the use of threads from "mostly always, depending on your
configure options and Gtk+ and GLib versions" to "always".

svn path=/trunk/; revision=39751
2011-11-07 23:42:53 +00:00
Jörg Mayer 03fe88b31f Mimic test for IPv6 support in GeoIP from autofoo
svn path=/trunk/; revision=39307
2011-10-08 06:09:38 +00:00
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Jörg Mayer 6332e88552 Copy over the commit 38437 to cmake.
svn path=/trunk/; revision=38438
2011-08-09 21:26:33 +00:00
Guy Harris 5a885f1a91 Get rid of HAVE_PCAP_SET_BUFFER_SIZE - nobody checks for
pcap_set_buffer_size() (if *pcap has pcap_create() it has
pcap_set_buffer_size(), as they were both introduced in libpcap 1.0.0),
and nobody looks at HAVE_PCAP_SET_BUFFER_SIZE.

svn path=/trunk/; revision=38382
2011-08-06 19:12:31 +00:00
Gerald Combs 53c550831b Define PACKAGE in config.h.
svn path=/trunk/; revision=38316
2011-08-02 21:23:00 +00:00
Jörg Mayer ada4a40003 Make USE_THREADS actually work with cmake
svn path=/trunk/; revision=38138
2011-07-21 00:13:14 +00:00
Jörg Mayer 950e4d19ad Add detection of rpcap support in libpcap and use it if available.
svn path=/trunk/; revision=37914
2011-07-06 09:28:40 +00:00
Stig Bjørlykke 8443bbbf75 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.

svn path=/trunk/; revision=37812
2011-06-28 09:00:11 +00:00
Jörg Mayer 5b22003e93 Add configure options to make change the default file format
from pcap-ng to pcap.
Add a comment that GTK3 doesn't build yet.

svn path=/trunk/; revision=37701
2011-06-17 22:57:02 +00:00
Jeff Morriss b9b68170f0 Don't check for the existence of gzclearerr() any more.
Check for inflatePrime().

svn path=/trunk/; revision=36955
2011-04-29 18:29:26 +00:00
Stephen Fisher a96e3dbe3b A little more old packet list cleanup
svn path=/trunk/; revision=36172
2011-03-08 20:23:48 +00:00
Jaap Keuter 4dd920a9aa From Roland Knall:
WS_MSVC_NORETURN is undeclared under a non-Windows operating system, which
breaks compilation in the files epan/except.c and dumpcap.c as well as any
file including epan/except.h

svn path=/trunk/; revision=36023
2011-02-21 21:33:54 +00:00
Jörg Mayer f337b03f39 Copy behaviour of
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34145
to cmake.

svn path=/trunk/; revision=34205
2010-09-23 09:05:31 +00:00
Jeff Morriss d8310ff499 Assume we HAVE_GZCLEARERR on Windows and when using cmake
svn path=/trunk/; revision=34192
2010-09-23 05:50:10 +00:00
Anders Broman f9981411f1 Checking in Stigs changes from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475
BUT not activating the check for 
pcap_create()
pcap_set_buffer_size()
This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic.

The code for handling the 'B' option should be OK in any case.

svn path=/trunk/; revision=32688
2010-05-06 18:34:30 +00:00
Guy Harris e6ecddd41f Add CMake tests for pcap_datalink_val_to_description() and
pcap_free_datalinks().

Sort the CMake tests in cmake/modules/FindPCAP.cmake into the same order
as the tests in the autoconf script, and note that, in the autoconf
script, the checks for pcap_open_dead() and pcap_freecode() do more than
just look for the routines in the library.

svn path=/trunk/; revision=32225
2010-03-17 19:31:33 +00:00
Stig Bjørlykke 98024a007f Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_H
Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision.

svn path=/trunk/; revision=30370
2009-10-06 16:01:18 +00:00
Jörg Mayer 95182116aa CMake:
- Add opcua to the list of plugins to build
- Link the gtk stuff statically into wireshark
- Beginnings of "make install"
- Change a few things about install paths

svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
Jörg Mayer 24fb135ffe Build the asn1 plugin. The only problem(?) is, that it is
name libasn1.so instead of asn1.so

svn path=/trunk/; revision=29919
2009-09-15 12:22:13 +00:00
Jörg Mayer 7eed375f9d Make building with GeoIP, Python, Capabilities and c-ares
actually work.

svn path=/trunk/; revision=29870
2009-09-12 17:20:08 +00:00
Jörg Mayer ca6b1e2b21 CMAKE: Get most of of missing *build* pieces into place
svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
Kovarththanan Rajaratnam 2a5826d250 Define some windows specific header files
svn path=/trunk/; revision=29660
2009-09-01 19:27:59 +00:00
Kovarththanan Rajaratnam f4c7321fc4 Check for mkdtemp()
svn path=/trunk/; revision=29659
2009-09-01 19:19:41 +00:00
Jörg Mayer 1925235323 Add check for HAVE_MKSTEMP to make build work again on
platforms that know about mkstemp().

svn path=/trunk/; revision=29645
2009-08-31 23:11:52 +00:00
Kovarththanan Rajaratnam 746124c935 CMake: Remove PRId64, PRIu64, PRIx64, PRIX64, and PRIo64 which are unused
svn path=/trunk/; revision=29639
2009-08-31 18:48:16 +00:00
Jörg Mayer 67d508edaf OK, so my last commit message was too optimistic - I was using
an installed version of wsutil. dumpcap now really builds on
Linux via cmake.

svn path=/trunk/; revision=28754
2009-06-16 04:12:30 +00:00
Jeff Morriss 86e10880c9 Remove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv replacements.
svn path=/trunk/; revision=25765
2008-07-18 12:11:08 +00:00
Sake Blok 5fe95468a2 Bug 1227 : From Frederic Heem:
* modify CMakeInstallDirs.cmake according to cmake developper wishes
* FindDBUSGLIB.cmake fixes
* Add HAVE_CHOWN 
* remove DBus from CMakeLists.txt. 
* DBus support has its own application (capdbus) and is in a self contained directory. A separate patch will be provided



svn path=/trunk/; revision=23300
2007-10-28 23:49:15 +00:00
Jörg Mayer e26860607d Get rid of UCD SNMP support (it's not longer supported and
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.


svn path=/trunk/; revision=20071
2006-12-08 15:05:41 +00:00
Jörg Mayer e8a5a41045 Parts of http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1179
Frederic Heem:
* More cmake system checks. It compiles dumpcap without running configure,

svn path=/trunk/; revision=19672
2006-10-24 17:39:32 +00:00
Jörg Mayer d6417e0842 cmake/
Add some more (hackish) tests.
	Add a LICENSE file until I find the time to add it to all
	files individually.

CMakeLists.txt
	Add some addiotional stuff regarding options.
	Add (non-working) code to generate config.h
	Handle GTK1 vs GTK2 and GLIB1 vs GLIB2

svn path=/trunk/; revision=19168
2006-09-06 22:28:19 +00:00