Commit Graph

81 Commits

Author SHA1 Message Date
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