Commit graph

161 commits

Author SHA1 Message Date
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
Guy Harris
87d4f06b2f At least with the Shiny New llvm-gcc in Xcode 4.4.1, there's no need to
add -no-cpp-precomp; I think the way the compiler handled precompiled
headers changed at some point.  Let's stop adding it; that would fix bug
5878.

svn path=/trunk/; revision=44816
2012-09-08 18:42:21 +00:00
Guy Harris
001dbcfc0b We no longer use Gestalt(), so there's no need to check for it.
We *do*, however, use CFPropertyListCreateWithStream(), so we need to
check for it, and, if we're able to use the OS X frameworks at all, use
CFPropertyListCreateFromStream() if we don't have
CFPropertyListCreateWithStream().

svn path=/trunk/; revision=44812
2012-09-08 07:46:56 +00:00
Anders Broman
342c344c1f From Pontus Fuchs:
Fall back to CMD_SET_WIPHY for older kernels. 

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

svn path=/trunk/; revision=44768
2012-09-04 08:57:03 +00:00
Jörg Mayer
fcb0307fae The name configure.in has been deprecated for many years.
Use configure.ac instead.

svn path=/trunk/; revision=44630
2012-08-23 11:11:24 +00:00
Renamed from configure.in (Browse further)