Commit graph

687 commits

Author SHA1 Message Date
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
Anders Broman
2450d57b38 make MAIN_MENU_USE_UIMANAGER the default.
svn path=/trunk/; revision=38657
2011-08-22 07:44:56 +00:00
Stephen Fisher
a6d3e1fa30 Change || in an "if test" statement to "-o"
svn path=/trunk/; revision=38611
2011-08-18 23:48:46 +00:00
Michael Tüxen
1f9f878af8 Get --enable-ui-manager working.
svn path=/trunk/; revision=38609
2011-08-18 22:50:35 +00:00
Jörg Mayer
aa22951fa8 When building with GTK3 we *must* use the ui-manager interface,
the ItemFactory stuff doesn't exists any more.

svn path=/trunk/; revision=38607
2011-08-18 20:38:25 +00:00
Jörg Mayer
b87f22700e Always build with -DGTK_DISABLE_DEPRECATED. The files that
fail when built in specific configurations will disable this
option when required.

svn path=/trunk/; revision=38588
2011-08-17 17:34:56 +00:00
Bill Meier
4bf797bcc0 Use '-D_FORTIFY_SOURCE=2' when compiling with GCC or CLang.
For info see: http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html


svn path=/trunk/; revision=38467
2011-08-11 02:14:20 +00:00
Bill Meier
a5abe51580 Add -DG_DISABLE_SINGLE_INCLUDES to CFLAGS
Also: Move the addition of -DG_DISABLE_DEPRECATED to CFLAGS
      so that it actually takes effect.

svn path=/trunk/; revision=38466
2011-08-11 02:08:30 +00:00
Jeff Morriss
bf95c7b5e4 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :
getopt() can/should normally be found in unistd.h, so:

- When testing for getopt(), define that we HAVE_GETOPT instead of
  HAVE_GETOPT_H (to avoid confusion).
- Don't attempt to include getopt.h: not all OS's have it (for example,
  Solaris 9 does not).
- (All the places which need getopt already include unistd.h (if we have it).)

If this breaks things on some OS, we might need (a real) HAVE_GETOPT_H check.

svn path=/trunk/; revision=38437
2011-08-09 21:02:10 +00:00
Jörg Mayer
e22f19f645 MAIN_MENU_USE_UIMANAGER is also used in some includes, not only
in .c files, so the aproach to #undef GTK_DISABLE_DEPRECATED was
wrong.
Only enable GTK_DISABLE_DEPRECATED if MAIN_MENU_USE_UIMANAGER is
defined.

svn path=/trunk/; revision=38420
2011-08-08 20:35:36 +00:00
Jörg Mayer
6ef6042641 GTK3 stuff:
- Update Status file
- configure.in: start GSEALing with 2.20 and not 2.22
- configure.in/config.nmake/CMakeLists.txt: enable GTK_DISABLE_SINGLE_INCLUDE
    and GTK_DISABLE_DEPRECATED
- menus.c: If not building with UI_MANAGER, disable GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38404
2011-08-08 13:39:21 +00:00
Jörg Mayer
553c565699 mate_grammar.lemon:
- Fix a bug my previous patch introduced.

mate/:
- Unset G_DISABLE_DEPRECATED for the mate files.

CMakeLists.txt
configure.in:
- Build with -DG_DISABLE_DEPRECATED so further usage of
  deprecated glib functions will be detected.

svn path=/trunk/; revision=38393
2011-08-07 18:35:36 +00:00
Jeff Morriss
c330acaa8c As suggested by Anders: only compile with GSEAL_ENABLE if we're using GTK 2.22 or higher (and not GTK3)
svn path=/trunk/; revision=38341
2011-08-04 21:38:31 +00:00
Bill Meier
1293999174 '-Wno-error=unused-but-set-parameter' not req'd since no such warnings in Wireshark compile.
svn path=/trunk/; revision=38318
2011-08-03 15:24:06 +00:00
Bill Meier
6e97a2e143 For now: treat GCC 4.6 'unused-but-set' reports as just warnings (i.e., when -Werror).
GCC 4.6 has added 'unused but set' reports so this change allows builds to proceed without
erroring out for those building from SVN with GCC 4.6.

(AFAIK Wireshark source distributions do not enable -Werror).

This change can be removed (at least globally) once the code as been fixed.



svn path=/trunk/; revision=38311
2011-08-02 16:17:25 +00:00
Jörg Mayer
9283597c75 Configuring with --enable-ui-manager would not work - fix this.
svn path=/trunk/; revision=38287
2011-07-31 13:32:05 +00:00
Stig Bjørlykke
050b61d4cf Print a more correct error message when missing gtk3.
This fixes bug 6181.

svn path=/trunk/; revision=38262
2011-07-29 19:35:16 +00:00
Stig Bjørlykke
3834af4bc0 Try build with GSEAL_ENABLE if not gtk3 again.
svn path=/trunk/; revision=38261
2011-07-29 17:00:59 +00:00
Stig Bjørlykke
4f3bcc86cc Removed building with GSEAL_ENABLE, does not work yet.
svn path=/trunk/; revision=38256
2011-07-29 12:06:24 +00:00
Stig Bjørlykke
693ebda5d8 Build with GSEAL_ENABLE if not gtk3.
svn path=/trunk/; revision=38255
2011-07-29 11:04:58 +00:00
Jörg Mayer
e7c7244bfe Back out my last changes to configure.in - they broke too much
svn path=/trunk/; revision=38168
2011-07-22 10:17:58 +00:00
Jörg Mayer
cf55ea274e When moving stuff around, move it all.
svn path=/trunk/; revision=38167
2011-07-22 09:50:30 +00:00
Jörg Mayer
be8667d7ad Fix the order of tests: the test for wireshark needs to run after
the test for gtk.

svn path=/trunk/; revision=38163
2011-07-22 05:50:45 +00:00
Guy Harris
6eec1f97bb Regularize style a bit in help messages.
Clean up capitalization.

Fix a comment.

svn path=/trunk/; revision=38130
2011-07-20 05:49:24 +00:00
Michael Tüxen
e4b18600fb Get --enable-ui-manager working.
svn path=/trunk/; revision=38084
2011-07-18 13:36:11 +00:00
Jörg Mayer
9a7fcb7ec7 Add option --enable-uimanager to mimic cmake -DUI_MANAGER=ON
svn path=/trunk/; revision=38081
2011-07-18 12:49:16 +00:00
Michael Tüxen
4c7db09d5c Use threads per default. Same as on Windows.
svn path=/trunk/; revision=38060
2011-07-16 13:02:44 +00:00
Michael Tüxen
73de1d4952 Ensure that USE_THREADS is defined when --enable-threads is specified.
svn path=/trunk/; revision=38046
2011-07-15 14:59:42 +00:00
Gerald Combs
cf161b7735 Make the minimum GLib version 2.14 and the minimum GTK+ version 2.12.
svn path=/trunk/; revision=37967
2011-07-11 17:49:59 +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
Gerald Combs
8d88f3a790 Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or
pcap.  Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).

Update the documentation and release notes.

svn path=/trunk/; revision=37696
2011-06-17 17:52:31 +00:00
Guy Harris
350ec69e9a Do the Python embedding similarly to other "default = yes, if available"
items.

Add some quoting to the zlib tests, just in case the argument contains
white space.

Clean up capitalization of Lua and Python.

Link programs that use libwireshark with the Python libraries, and build
Epan with the Python cflags.

svn path=/trunk/; revision=37652
2011-06-11 19:05:17 +00:00
Anders Broman
afb0e8b434 From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005

svn path=/trunk/; revision=37610
2011-06-08 05:20:43 +00:00
Guy Harris
e25095dfe5 The SERCOS III dissector is now built-in.
svn path=/trunk/; revision=37605
2011-06-08 01:37:18 +00:00
Anders Broman
2ef145dfb2 Remove HAVE_AIRPDCAP
svn path=/trunk/; revision=37496
2011-05-31 21:41:00 +00:00
Jeff Morriss
e7974bf250 AirPcap is disabled by default; fix the help text to reflect that fact.
svn path=/trunk/; revision=37423
2011-05-27 03:22:48 +00:00
Anders Broman
2756b787d3 Copy-paste error.
svn path=/trunk/; revision=37394
2011-05-25 15:01:07 +00:00
Anders Broman
84a22ed17e Make it easier to add custom asn1 dissectors.
svn path=/trunk/; revision=37393
2011-05-25 14:21:42 +00:00
Guy Harris
17d758799e One "-Warray-bounds" suffices; as we're including it in the default
options, no need to include it in the "extra warnings" options as well.

svn path=/trunk/; revision=37387
2011-05-25 02:35:30 +00:00
Jörg Mayer
07265037dd Update CMakeLists to follow commit 37219.
Remove a duplicate check in configure.in

svn path=/trunk/; revision=37277
2011-05-19 04:35:04 +00:00
Guy Harris
e902f33d18 Add -Wold-style-definition and -Wdeclaration-after-statement to the list
of warnings we enable by default; we'll move them if they break any
builds in non-fixable ways.

Add -Wmissing-prototypes and -Wmissing-declarations to the list of
things we don't enable by default, and explain why those, and
-Wstrict-prototypes can't be used.

Also explain why we check for clang before checking whether we can
enable -fexcess-precision=fast.

svn path=/trunk/; revision=37219
2011-05-17 22:24:26 +00:00
Jeff Morriss
99a76aca46 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5875 :
Error out if the user asked us to install dumpcap with a particular group but
we are not building dumpcap.

svn path=/trunk/; revision=37208
2011-05-17 19:59:18 +00:00
Gerald Combs
1c831b6343 1.5.2 → 1.7.0.
svn path=/trunk/; revision=37148
2011-05-14 20:17:37 +00:00
Jeff Morriss
86f69833bf We need both gthread and gmodule.
svn path=/trunk/; revision=37101
2011-05-12 20:35:13 +00:00
Michael Tüxen
3501febf60 Initialize the glib thread system on all platforms, not only on Windows.
This requires to be linked against a different library. This is only
required for dumpcap, but the configure files currently doesn't check
this in a target specific way. So use these libs for all binaries.

svn path=/trunk/; revision=37095
2011-05-12 18:55:24 +00:00
Jakub Zawadzki
b680407847 Conditional support for packet-editor [default=no].
svn path=/trunk/; revision=37084
2011-05-12 17:14:59 +00:00
Guy Harris
7eb4723184 Don't bother checking for gzgets(), as we don't use it, and don't even
need to use its presence in zlib as a proxy for "not the crufty old zlib
that comes with some versions of X11".

Do, however, check for inflatePrime() there, instead, just in case the
crufty old zlib that comes with some versions of X11 lack it; this is to
prevent the configure script from assuming a shiny new zlib by testing
with a non-X11 program, causing the build to fail when you build
Wireshark.

svn path=/trunk/; revision=36969
2011-05-03 04:48:02 +00:00
Jakub Zawadzki
229adbc1e5 configure: remove test for gzclearerr (not used anymore), add test for inflatePrime.
svn path=/trunk/; revision=36949
2011-04-29 07:49:55 +00:00
Stephen Fisher
49d5d071a0 Don't pass -fexcess-precision=fast to clang like we do for gcc.
svn path=/trunk/; revision=36828
2011-04-22 19:31:09 +00:00
Guy Harris
4bdde629bb Oh, dear, autoconf thinks clang is GCC, because it defines __GNUC__.
svn path=/trunk/; revision=36733
2011-04-20 09:31:47 +00:00