Commit Graph

154 Commits

Author SHA1 Message Date
Guy Harris 9a09ef907a AC_LANG_PROGRAM's second argument is put inside "int main(){"/"}" by the
macro, and mustn't include that itself.

svn path=/trunk/; revision=50205
2013-06-28 09:59:19 +00:00
Guy Harris fd5281c763 AC_PROG_CXX doesn't actually check whether what it finds is a real live
C++ compiler (it might not be one on, for example, OS X, due to "cc"
being a C compiler, "CC" referring to "cc" due to the case-insensitivity
of the default OS X file system, and "CC" being one of the names checked
for in AC_PROG_CXX), so if we really need a C++ compiler, test it with a
program that a C compiler won't compile.

svn path=/trunk/; revision=50204
2013-06-28 08:36:35 +00:00
Guy Harris ca9122bfec Suppress "Of *COURSE* you're developing a Mac-only application - you're
on a Mac, right?  So of *COURSE* you want to use our shiny new frameworks
rather than those ugly old open-source multi-platform libraries, right?"
warnings.

svn path=/trunk/; revision=50200
2013-06-27 23:11:05 +00:00
Guy Harris b450609a55 For now, don't turn on -Wcast-align by default. There are at least some
bugs it points out that probably mean the code won't work on machines
that require alignment (e.g., SPARC machines), but we'll turn it on once
we fix them.  (clang is fussier than GCC about this.)

svn path=/trunk/; revision=50187
2013-06-27 10:35:06 +00:00
Guy Harris 04cc1e2fb5 Don't assume that compilers not named "clang" will, by default, report
an error, or not issue warnings, by default if you give them an unknown
-f flag.  Instead, test that flag with all compilers, and use -Werror to
force it to error out.

As with C/C++ flags, so with C++-only flags.

svn path=/trunk/; revision=50178
2013-06-27 00:45:39 +00:00
Guy Harris eaf5e3fd1f Don't assume that compilers that need an extra option to report errors,
rather than just warnings, for unknown warning options are named
"clang"; they might not be.

svn path=/trunk/; revision=50177
2013-06-26 22:43:51 +00:00
Jeff Morriss cbe96aeb4d echld is not an optional package, it's an optional Wireshark feature: use
--enable-echld rather than --with-echld to control whether it is built.

svn path=/trunk/; revision=50168
2013-06-26 13:52:52 +00:00
Jeff Morriss 6df12cbcf7 If the user enables gtk3, (silently) disable gtk2 rather than forcing the user
to also specify --without-gtk2 or complaining that they have specified both.

svn path=/trunk/; revision=50167
2013-06-26 13:26:25 +00:00
Guy Harris 3ab335948b Nothing uses the HAVE_GTK #define, so get rid of it. (Keep the
Makefile.am conditional, however.)

svn path=/trunk/; revision=50162
2013-06-26 00:48:58 +00:00
Luis Ontanon 0a060270b3 Last changes to autofoo, rename the files as they live now in their own dir...
svn path=/trunk/; revision=50152
2013-06-25 21:09:29 +00:00
Evan Huus 242a37ea3e Look for moc-qt4 before moc and uic-qt4 before uic, because (at least on my
machine, with both qt4 and qt5 development tools installed), moc and uic are the
qt5 versions, but the rest of the configuration process grabs qt4 headers and
link paths, leading to a lot of weird errors.

svn path=/trunk/; revision=50150
2013-06-25 20:49:16 +00:00
Jeff Morriss 9cb2e270d6 Of course I forgot to test the normal/default case (where no --with arguments
are given)...

Actually default --with-gtk2 to "yes".

svn path=/trunk/; revision=50149
2013-06-25 20:06:33 +00:00
Jeff Morriss fd95d841b8 Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
./configure now accepts:
	--with-gtk2 :  enabled by default; exclusive of --with-gtk3
	--with-gtk3 : disabled by default; exclusive of --with-gtk2
	--with-qt   : disabled by default, can be specified with gtk
	--enable-wireshark : controls whether *any* GUI is built

If Qt is enabled then a new program is created: "wireshark-qt".  "wireshark"
remains the Gtk+ version.

svn path=/trunk/; revision=50147
2013-06-25 19:51:53 +00:00
Luis Ontanon e200f6cbf9 This should get cmake to ignore echld...
svn path=/trunk/; revision=50141
2013-06-25 17:43:52 +00:00
Luis Ontanon a75e89c787 Revert --with-echld until I find out how to get it to work with Cmake...
:

svn path=/trunk/; revision=50138
2013-06-25 04:50:36 +00:00
Luis Ontanon 1c8b686eb0 --with-echld
svn path=/trunk/; revision=50137
2013-06-25 04:20:08 +00:00
Gerald Combs c0702583d3 Make the minimum supported GLib version 2.16.
svn path=/trunk/; revision=49444
2013-05-20 17:27:05 +00:00
Guy Harris 1043692610 HTML_VIEWER isn't used in the build process, it's run by Wireshark.
svn path=/trunk/; revision=49257
2013-05-12 07:37:22 +00:00
Guy Harris b7c5f4baa7 Add some comments describing what programs are being checked for.
Move DESKTOP_FILE_INSTALL into the group of programs used for packaging;
it's used when you install a source package.  (It's not used to *build*
a source package, but....)

svn path=/trunk/; revision=49256
2013-05-11 23:59:17 +00:00
Guy Harris 5bf8bd4f15 Don't just look for python2. Instead, first look for python, and then
see whether it's Python 2 or not; if it's not, *then* look for Python 2.

That way, you can use Python on systems where python is Python 2 and
python2 doesn't exist.

Move the check for Python up after the check for Perl.  (All the program
checks arguably belong together.)

AC_PATH_PROG() does AC_SUBST() for you; don't do it ourselves.

svn path=/trunk/; revision=49253
2013-05-11 20:04:46 +00:00
Martin Kaiser 8388c1fa75 From Jeroen Roovers
call PKG_PROG_PKG_CONFIG explicitly in configure.ac
    
AC_REQUIRE(PKG_PROG_PKG_CONFIG) may be expanded only under an if
statement that's not true and thus PKG_PROG_PKG_CONFIG will never be
called.
    
./configure --without-gnutls --with-libnl demonstrates the problem

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

svn path=/trunk/; revision=49215
2013-05-09 14:41:54 +00:00
Gerald Combs ee26b25981 Add a link to the Survey of Commonly Available C System Header Files. It
looks like we might be able to get rid of a few header checks.

svn path=/trunk/; revision=49139
2013-05-02 15:17:46 +00:00
Jeff Morriss a52f0c61f3 As suggested by Evan:
Point users to https://code.google.com/p/pyreshark/ as an alternative to the
current Python support.

While we're in there, make it harder to enable Python: change it from
"--with-python" to "--with-broken-python" just to prevent people from enabling
unless they really mean it (are going to work on fixing it).

svn path=/trunk/; revision=49138
2013-05-02 14:55:33 +00:00
Jörg Mayer 4c444efdf1 Make the python scripts work on systems where python is a link
to python3: explicitely call the python2 binary.

svn path=/trunk/; revision=49121
2013-05-01 21:50:44 +00:00
Gerald Combs ea19c7f952 1.9.3 → 1.11.0.
svn path=/trunk/; revision=48972
2013-04-22 17:59:38 +00:00
Gerald Combs 1cb1c73756 Looks like the licensing change only applies to GnuTLS 3.1.10.
svn path=/trunk/; revision=48759
2013-04-06 15:45:28 +00:00
Gerald Combs 3217be744a GnuTLS recently switched back to a compatible license (LGPLv2.1+).
Update our checks accordingly.

svn path=/trunk/; revision=48758
2013-04-06 15:39:39 +00:00
Gerald Combs b60e41b984 1.9.2 → 1.9.3.
svn path=/trunk/; revision=48627
2013-03-28 18:13:22 +00:00
Gerald Combs 49294f3f52 It looks like GLib 2.36.0 was released on the 25th as well, although I
can't find a release announcement.

svn path=/trunk/; revision=48603
2013-03-27 23:55:05 +00:00
Stig Bjørlykke 3d07727dc8 Remove searching in $prefix for packages as requested in bug 6011 and bug 7926.
svn path=/trunk/; revision=48582
2013-03-27 09:44:34 +00:00
Gerald Combs 4e1e60c4bf It's 2013.
svn path=/trunk/; revision=48580
2013-03-27 03:57:38 +00:00
Gerald Combs 1ede51034e Add the release date for GTK+ 3.8.0.
svn path=/trunk/; revision=48579
2013-03-27 03:56:42 +00:00
Guy Harris 557df88def Thanks to a ton of patches from Ed Beroset and some other changes,
Wireshark compiles with -Wc++-compat and -Werror, at least on my machine
with llvm-gcc 4.2.1.  Make that a standard -W flag, to keep code that
won't pass a C++ compiler from sneaking back in (except in the files
that can't currently be compiled with -Werror for various reasons).

svn path=/trunk/; revision=48535
2013-03-24 18:24:29 +00:00
Guy Harris 60c7db1796 Some more tYpo/cut-and-pasteo fixes for my libnl changes.
svn path=/trunk/; revision=48408
2013-03-18 22:26:36 +00:00
Gerald Combs 4c87778b7a 1.9.1 → 1.9.2.
svn path=/trunk/; revision=48406
2013-03-18 22:18:52 +00:00
Guy Harris 4bbd68bf31 Fix some bugs in my libnl configuration changes found when testing on
Linux.

svn path=/trunk/; revision=48403
2013-03-18 22:05:28 +00:00
Guy Harris 08b1abe302 Don't bother doing any of the Linux-specific libnl or nl80211 checks on
non-Linux systems.  Warn the user if they specified --with-libnl on one
of those systems.

Allow the user to specify a particular libnl version with --with-libnl. 
If the user specifies --with-libnl=VERSION, and that libnl version isn't
found, fail.  No need to have an explicit "auto" argument - that's the
default.

Fix a typo in a definition message.

svn path=/trunk/; revision=48402
2013-03-18 21:33:38 +00:00
Evan Huus 81700ec3e0 Follow-up to r48395 and bug #8494.
Make libnl a --with flag instead of an --enable flag, since it is an optional
package. Make it a three-way flag, where 'no' disables, 'yes' enables (and
errors if it can't be found), and 'auto' enables (but doesn't complain if it
can't be found). Default to 'auto', which was our old behaviour.

[This is my first real foray into autoconf, so hopefully I got everything right]

svn path=/trunk/; revision=48398
2013-03-18 20:30:02 +00:00
Evan Huus a4cb525bad From Michael Weiser via Rick Farina via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8494

Permit disabling libnl integration in ./configure

svn path=/trunk/; revision=48395
2013-03-18 19:01:41 +00:00
Gerald Combs fc6e505dac Switch to Asciidoc for the release notes. The initial conversion from
Docbook was done using Pandoc and cleaned up by hand. Add an
asciidoc.conf which contains macros for linking to Wireshark bugs and
CVE IDs.

Remove the release-notes.chm target. I don't think we ever used it and
we're probably better off generating PDF or HTML if we need something
fancier than plain text.

In configure.ac, consolidate program path discovery a bit and add a2x
discovery.

svn path=/trunk/; revision=48307
2013-03-15 00:08:18 +00:00
Bill Meier d56c18f586 Always build with GDK_PIXBUF_DISABLE_DEPRECATED, GDK_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED
Also:	# Enable GSEAL when building with GTK > 2.20

svn path=/trunk/; revision=48149
2013-03-06 22:17:25 +00:00
Gerald Combs a79e5d5b94 Check to see if GLib's printf routines support the X/Open / POSIX
thousands grouping (') flag and use it in format_size if it's available.
As far as I can tell this translates to "everywhere except Windows and
OpenBSD". According to the various build logs at

https://build.opensuse.org/package/show?package=mingw32-glib2&project=windows%3Amingw%3Awin32

the OBS GLib packages enable GLib's internal printf implementation from
Gnulib which means we *should* be able to enable this on Windows.
Unfortunately this doesn't appear to be the case.

svn path=/trunk/; revision=48042
2013-03-03 19:34:58 +00:00
Balint Reczey 1eb5e1d739 Revert "Make Solaris Studio hide internal shared library symbols by default"
This reverts commit r48020.

svn path=/trunk/; revision=48022
2013-03-02 22:27:40 +00:00
Balint Reczey 73aafe2bc4 Make Solaris Studio hide internal shared library symbols by default
svn path=/trunk/; revision=48020
2013-03-02 22:11:26 +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
Balint Reczey 45c2884f1b Export libwsutil symbols using WS_DLL_PUBLIC define
This change replaces *.def and *.sym file usage following the
guideline at http://gcc.gnu.org/wiki/Visibility

svn path=/trunk/; revision=47938
2013-02-28 14:09:46 +00:00
Jeff Morriss 6e79875c8d Look for desktop-file-install (to be used when installing wireshark.desktop).
svn path=/trunk/; revision=47907
2013-02-27 02:32:00 +00:00
Gerald Combs f14ad04d4d More 1.9.0 → 1.9.1 changes. Release note updates.
svn path=/trunk/; revision=47777
2013-02-20 21:17:30 +00:00
Guy Harris a26d951d8a Oops, the list is of Makefiles, not of directories that should contain
Makefiles.

svn path=/trunk/; revision=47712
2013-02-17 19:14:10 +00:00
Guy Harris c025682454 Add asn1/isdn-sup to the list of directories in which to generate a
Makefile.

svn path=/trunk/; revision=47711
2013-02-17 19:12:35 +00:00
Jeff Morriss de92a29c0c Move move of the Qt checks into AM_PATH_QT.
svn path=/trunk/; revision=47553
2013-02-08 02:51:14 +00:00
Jeff Morriss 4bbe78cbdf If we're compiling for Qt check if we have a working C++ compiler.
svn path=/trunk/; revision=47544
2013-02-08 01:16:27 +00:00
Jeff Morriss 8a6b4d596d QPropertyAnimation is needed for Qt builds and isn't present until Qt 4.6.0.
Add a (crude) check for the Qt version, making 4.6.0 the minimum.

The existing checks in configure.ac should be moved into into this new module.

svn path=/trunk/; revision=47537
2013-02-07 20:51:52 +00:00
Jeff Morriss ac48ce1d6d Use variables for the versions autoconf, GTK{2,3}, and glib we require.
Use them instead of repeating the same number several times.
AC_SUBST() them so we can pick them up in, for example, wireshark.spec.in .

svn path=/trunk/; revision=47481
2013-02-05 02:06:48 +00:00
Guy Harris 1d3e62c025 Add the warning flags to CFLAGS_FOR_BUILD, so any build tools we build
are built with warnings.

Also add compiler-specific flags (in this case, just the flags to enable
ANSI C compilation) to CFLAGS_FOR_BUILD.

svn path=/trunk/; revision=47479
2013-02-04 22:23:19 +00:00
Guy Harris 9b01e0470f "make dist" uses uic and moc, so we have to try to find them no matter
what.  If we don't find them, and the user specified --with-qt, fail (if
we haven't already failed to find Qt at all); if we don't find them, and
the user *didn't* specify --with-qt, just set UIC and MOC to "uic" and
"moc", which will fail on "make dist" but will at least allow the user
to build.

svn path=/trunk/; revision=47475
2013-02-04 20:03:01 +00:00
Gerald Combs d5081b3eb6 Make sure AM_DEFAULT_VERBOSITY is defined no matter what.
svn path=/trunk/; revision=47471
2013-02-04 17:37:25 +00:00
Gerald Combs 037a36531c Enable silent build rules by default.
svn path=/trunk/; revision=47467
2013-02-04 16:48:14 +00:00
Guy Harris 02da11d645 Sigh. At least on my Fedora 16 with KDE, the Qt 4 versions of uic and
moc are called uic-qt4 and moc-qt4.  Look for them by names, plural.

svn path=/trunk/; revision=47457
2013-02-03 21:39:11 +00:00
Jeff Morriss 5e543a3e28 From Hadriel Kaplan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202 :
AM_CONFIG_HEADER() is obsolete (and removed from automake 1.13 and later); use
AC_CONFIG_HEADERS instead.

svn path=/trunk/; revision=47091
2013-01-15 14:07:53 +00:00
Jeff Morriss 3be49bedd1 In AC_WIRESHARK_GCC_CFLAGS_CHECK() don't check if $3 (the program to be run)
exists by doing:

	if test "x$3" != "x" ; then

because if the program contains quotes it breaks the shell's parsing.
Instead test for the existence of $4 (which is mandatory if $3 is given).


Fix up the test program for -Wlogical-op so that it actually compiles
warning-free (at least on my system) when the compiler doesn't have the bug
we're checking for.

svn path=/trunk/; revision=46926
2013-01-04 02:12:51 +00:00
Guy Harris fe350d7cbd On the Ubuntu buildbot, this says -Wlogical-op doesn't work, but it
worked OK before.  In the test program, try declaring foo() before
defining it, in case the problem is that --enable-extra-gcc-checks
enables checking for functions that weren't declared before they were
defined, so the lack of that declaration may have caused a separate
warning.

svn path=/trunk/; revision=46924
2013-01-03 22:16:53 +00:00
Jeff Morriss 69d42810f6 Don't use -Wlogical-op if it causes gcc to generate warnings about logical
operations always evaluating to the same value in (the expansion of)
strchr().

See: https://www.wireshark.org/lists/wireshark-dev/201212/msg00136.html

svn path=/trunk/; revision=46916
2013-01-03 16:50:54 +00:00
Gerald Combs a50850c0cd Fix UI library dependency checking.
svn path=/trunk/; revision=46902
2013-01-02 19:19:10 +00:00
Gerald Combs 749d5d1b95 Make -Wstrict-prototypes C-only.
svn path=/trunk/; revision=46899
2013-01-02 16:43:57 +00:00
Gerald Combs b62d650ba1 Play Three-card^WTwo-link-target Monte with Autotools.
svn path=/trunk/; revision=46887
2013-01-01 23:39:00 +00:00
Gerald Combs 4ecf61b0df If we're linking with Qt pass a hint to automake that it needs to use c++
linking.

svn path=/trunk/; revision=46878
2012-12-31 21:29:47 +00:00
Gerald Combs 7256f90069 Make sure we link Wireshark with the right UI library.
svn path=/trunk/; revision=46869
2012-12-31 06:09:19 +00:00
Gerald Combs 6c68031d7e Keep PKG_CHECK_MODULES from returning an error if it doesn't find
QtWidgets or QtPrintSupport.

svn path=/trunk/; revision=46867
2012-12-31 04:56:11 +00:00
Bill Meier 114a40ae09 '-Wno-error=unused-but-set-variable' no longer required;
svn path=/trunk/; revision=46859
2012-12-30 14:34:29 +00:00
Guy Harris e0b3a943f7 Move the PIE checks after the warning checks, to keep the warning checks
together, and add a comment explaining what's being done.

svn path=/trunk/; revision=46854
2012-12-29 22:50:48 +00:00
Bill Meier 1a97d3395a Cosmetic: Add two blank lines for readability.
svn path=/trunk/; revision=46848
2012-12-29 20:53:44 +00:00
Guy Harris 15feaf9744 OK, I give up.
svn path=/trunk/; revision=46759
2012-12-26 07:08:24 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Guy Harris 6549d5a47f Expand the comment about alignment.
svn path=/trunk/; revision=46642
2012-12-20 21:02:22 +00:00
Jeff Morriss 550c36d042 32-bit Linux (at least from Redhat) has a host_cpu of i686 (not i386). Don't force 8-byte alignment on such systems.
svn path=/trunk/; revision=46641
2012-12-20 20:52:26 +00:00
Jeff Morriss cb994b4f80 -pie also needs -fPIE (at least sometimes)
svn path=/trunk/; revision=46610
2012-12-19 03:50:52 +00:00
Jeff Morriss 8a916449e5 As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8076 :
Enable PIE (if the compiler supports it) when compiling dumpcap.  Do this
regardless of whether we're configured to install dumpcap setuid-root because
some users will end up running dumpcap as root regardless of how we were
configured.

svn path=/trunk/; revision=46608
2012-12-19 02:09:48 +00:00
Guy Harris 8b2fd19527 It's just compiling, not linking, so we don't need to have the external
function actually *exist*.

Declare foo() before defining it - if we configure with
--enable-extra-gcc-checks, given that we're building with -Werror (so
that we find out whether the compiler issues a warning for a particular
construct), we have to avoid constructs that will provoke *other*
warnings.

svn path=/trunk/; revision=46488
2012-12-10 06:47:36 +00:00
Guy Harris 0fbf4b5b1c Put back the extra checks for -Wshadow; I guess I'll need to set up a
Ubuntu 12 VM to figure out why -Wshadow was rejected, as it doesn't seem
to cause bogus errors.

svn path=/trunk/; revision=46477
2012-12-09 04:18:52 +00:00
Guy Harris 8d7e398dc7 Force -Wshadow on - it wasn't included on the Ubuntu buildbot, so I want
to see whether it really doesn't work right (i.e., warns bogusly about
variables in prototype definitions of function pointers shadowing
variables) or if the test fails for some other reason.

svn path=/trunk/; revision=46476
2012-12-09 04:00:03 +00:00
Guy Harris b961881fb3 Add some additional arguments to AC_WIRESHARK_GCC_CFLAGS_CHECK() to make
it do an additional check, if it finds that a given compiler option is
supported by the compiler, to see whether it's supported but
undesirable.  The arguments are a chunk of code to try to compile with
-Werror, and a string to be used in the "checking..." message printed
when trying to compile the cunk of code.

Try enabling -Wshadow again, but have it check whether

	extern int atoi(char *p);

	int
	foo(char *p)
	{
		int (*fptr)(char *p) = atoi;

		return fptr(p) * 2;
	}

compiles with -Wshadow and -Werror, so that we don't use -Wshadow with
compilers that complain about that; some older versions of GCC complain
about that, and it's really not worth our effort to eliminate or rename
arguments in function prototypes to make -Wshadow work even with those
compilers.

svn path=/trunk/; revision=46475
2012-12-09 02:52:33 +00:00
Bill Meier 9384bedb13 Revert SVN #46429 again (for now);
It appears that the compiler on
the OSX-10.5-x86 buildbot must be pretty old.

All the other *nix buildbot compilers do not
check the dummy param names used in the definition
of 'xxx' below to see if they are shadowing
anything.

void foo(tvbuff_t tvb, ...) {
  'void (*xxx)(tvbuff_t tvb, ....) = NULL;'
  ...
}

I do seem to remember reading that gcc once
had this issue but was fixed eventually.


svn path=/trunk/; revision=46430
2012-12-06 23:11:54 +00:00
Bill Meier c2639439e4 Enable [-Wshadow] as default for *nix compilers] (C only): 2nd try.
svn path=/trunk/; revision=46429
2012-12-06 22:15:21 +00:00
Guy Harris 123c134c24 And some other stuff moved to QtPrintSupport.
svn path=/trunk/; revision=46383
2012-12-05 00:50:51 +00:00
Guy Harris ef3d42ad74 Qt 5.0 appears to move the widgets out of Qt GUI to Qt Widgets; look for
QtWidgets and, if we find it, add its flags to CFLAGS and CXXFLAGS, so
that we find the include files for the widgets.  (If we don't find it,
we assume it's Qt 4.)

svn path=/trunk/; revision=46382
2012-12-04 23:37:49 +00:00
Bill Meier e5379cd38b Revert SVN #46380; i.e., remove -Wshadow & etc
svn path=/trunk/; revision=46381
2012-12-04 21:22:29 +00:00
Bill Meier 92f1fc7f49 OK: temporarily use -Wshadow and also -Wno-error=shadow
so we can get a complete list of the -Wshadow warnings
    seen by the buildbots.

svn path=/trunk/; revision=46380
2012-12-04 20:36:48 +00:00
Bill Meier 69de2d7767 Revert SVN #46376
Looks like this is not ready for prime time.

ToDo: determine why the OSX builds are finding issues that I don't see on Fedora.


svn path=/trunk/; revision=46378
2012-12-04 19:40:00 +00:00
Bill Meier 12f5acaefb Enable gcc -Wshadow for default *nix builds;
AFAIK, all GTK Wireshark non-dirty sources now compile
  without [-Wshadow] warnings.

(Altho I haven't tried the QT build or other possible
build variants), hopefully any remaining [-Wshadow] warnings for non-dirty
source can be fixed as they occur.

(Obviously this change can be reverted if there are many issues).

So: let's see if any of the automated builds break;  :)


svn path=/trunk/; revision=46376
2012-12-04 19:03:51 +00:00
Guy Harris bd976ae6c0 On UN*X, if an interface has a description, use it as the "friendly
name".  If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.

If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.

Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.

svn path=/trunk/; revision=46131
2012-11-22 06:02:49 +00:00
Guy Harris b9e8e95ffe Get rid of an unused variable.
svn path=/trunk/; revision=46130
2012-11-22 05:50:47 +00:00
Guy Harris 24d4323da6 Assume, at least for now, that "Darwin" means "OS X"; don't bother
checking whether the relevant frameworks are available.  (An iOS port's
going to require a *lot* more work, and I don't know whether
Darwin-the-pure-OS even builds and runs any more.)

We don't need Core Services any more, as we're no longer using
Gestalt().  We just need Core Foundation for getting the OS version and
Application Services for firing up Web browser or file manager windows.

svn path=/trunk/; revision=46129
2012-11-22 05:46:49 +00:00
Evan Huus 4e3ddfc4c1 Fix autotools build - missed a few spots that needed updating for wmem.
svn path=/trunk/; revision=45748
2012-10-24 03:44:34 +00:00
Gerald Combs 17fdfce1e6 Add release dates for GTK+ 3.6.0 and GLib 2.34.0.
svn path=/trunk/; revision=45181
2012-09-27 20:48:23 +00:00
Gerald Combs 196dbce3d2 Add back extra packaging information if it's present.
svn path=/trunk/; revision=45112
2012-09-24 21:57:52 +00:00
Martin Mathieson 60fb63783a From Jim Young, bug 7745.
Add Makefile support for reordercap.

svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
Jeff Morriss abc482e578 Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back off
the compile line when building with cmake.

Put _U_'s definition in config.h when building with autofoo and on Windows.

svn path=/trunk/; revision=45034
2012-09-21 01:42:03 +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
Anders Broman 84c57e6eb6 From Pontus Fuchs.
new check for the configure script to disable the tool bar if
the nl80211.h is not good enough.

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

svn path=/trunk/; revision=44839
2012-09-10 13:15:02 +00:00