Commit Graph

33 Commits

Author SHA1 Message Date
Stig Bjørlykke 9779ae3817 Removed some remaining svn Id tags
Change-Id: I7ffbf59099132cde55995bde991d1c6a5dd224b0
Reviewed-on: https://code.wireshark.org/review/12330
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-01 14:41:25 +00:00
João Valverde 67d9daa65b autotools: Fix extra-compiler-warnings for system headers
Use -isystem instead of -I for external headers with GCC/clang to squash
all the noise.

cmake already uses -isystem by default for supported platforms/compilers.

Change-Id: Ia6c9d1eb9b894fda6f48c531094d792e16fd39fc
Reviewed-on: https://code.wireshark.org/review/11947
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-21 13:50:54 +00:00
Dhiru Kholia 58528f6d91 Fix AddressSanitizer (./configure --enable-asan) builds
"./configure --enable-asan" currently fails to detect installed libraries
because aclocal-fallback/* built programs have memory leaks in them.

configure:34516: checking for GTK+ - version >= 3.0.0
configure:34626: gcc -o conftest ...
...
configure:34626: $? = 0
configure:34626: ./conftest

=================================================================
==29007==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 6 byte(s) in 1 object(s) allocated from:
    #0 0x7fa5c95dd9aa in malloc (/usr/lib/x86_64-linux-gnu/libasan.so.2+0x989aa)
    #1 0x7fa5c8995578 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x4f578)

SUMMARY: AddressSanitizer: 6 byte(s) leaked in 1 allocation(s).
configure:34626: $? = 23
configure: program exited with status 23
...
configure:34649: result: no
configure:34699: error: GTK+ 3 is not available

...

This system is running 64-bit Ubuntu Linux 15.10 with GCC 5.2.1
compiler.

The glib-2-0.m4 leak, and the gtk-3.0.m4 leak are fixed by updating
"glib-2.0.m4" to the latest upstream version.

Whitespace errors are fixed locally to keep the BuildBot happy.

Change-Id: I01a5f4c494a59ae6d0ee19cd2611fab163ebf9b4
Reviewed-on: https://code.wireshark.org/review/11283
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-04 12:16:17 +00:00
Stephen Fisher a621bb7dde Revert "Bring pkg.m4 in from pkgconfig version 0.28 so we can use the PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when it isn't installed. Without this (and without pkg-config installed) the configure script is broken. With it, it gives a mes"
This reverts commit f94eb27862.

Change-Id: I1a74fa221bdb3d72e88a46ced64e0d434a8fe552
Reviewed-on: https://code.wireshark.org/review/6231
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-02 03:49:52 +00:00
Stephen Fisher f94eb27862 Bring pkg.m4 in from pkgconfig version 0.28 so we can use the
PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when
it isn't installed.  Without this (and without pkg-config installed)
the configure script is broken.  With it, it gives a message saying
pkg-config isn't found.

Change-Id: I4c5af4cedd8c1927c1e00dd6b42faef3f31b84d4
Reviewed-on: https://code.wireshark.org/review/5671
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-19 11:58:20 +00:00
AndersBroman b6f8aea069 See if this version works better on OSX 10.5
AX_EXT has been extended to deal with a situation where
AX_GCC_X86_CPUID(0x00000001) returns 'unknown'. Further details can be found
at <http://savannah.gnu.org/patch/?8321>.

Change-Id: I0b8173789ddfc1670e9896408f5d022c30a1d0a9
Reviewed-on: https://code.wireshark.org/review/2112
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 16:08:06 +00:00
AndersBroman 99d8c1cce5 Add macros to make it possible to define HAVE_SSE4_2
Change-Id: I63ecfde72f33350d15c430da71fa11ac4923a121
Reviewed-on: https://code.wireshark.org/review/2109
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 12:22:41 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Jeff Morriss 0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Guy Harris f317c7821d The files in aclocal-fallback are copies of .m4 files from various
packages, providing macros that we use in our configure script in case
somebody building from SVN doesn't happen to have the package installed
and thus doesn't happen to have those macros defined.

In the case of Qt, there *isn't* such a .m4 file, so we had to create
the macro.  Move it to acinclude.m4, and rename it to
AC_WIRESHARK_QT_CHECK to indicate that it's our own check.

svn path=/trunk/; revision=50881
2013-07-24 22:34:44 +00:00
Guy Harris 9c5b6c76a6 Check for QtMacExtras, and use it if we have it.
svn path=/trunk/; revision=50880
2013-07-24 22:14:50 +00:00
Guy Harris c089afca5c OK, with Qt 5.1, the pkg-config modules are all called Qt5Xxx rather
than QtXxx, so look for those as well.

svn path=/trunk/; revision=50568
2013-07-14 02:35:26 +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 c8d70864c6 Check for QtCore instead of Qt.
svn path=/trunk/; revision=47543
2013-02-07 22:58:38 +00:00
Jeff Morriss 5f101234d6 Use a variable for the package name we're querying.
Add SVN Id.

svn path=/trunk/; revision=47538
2013-02-07 20:58:45 +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 a2c21a2b53 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6737
As suggested by njtaylor0101 [AT] gmail.com: we (always) check for the gthread
module when checking glib so there's no need to check for it when checking GTK.
This prevents us, when configuring with gtk3, for checking for gthread-2.0
version 3.0.0 or later.

svn path=/trunk/; revision=40684
2012-01-24 03:16:33 +00:00
Jeff Morriss e3f8def24f When checking for GTK+2, indicate that we will *not* accept GTK 3 and later.
svn path=/trunk/; revision=39699
2011-11-01 01:08:59 +00:00
Stephen Fisher 5e5aa3c09e Add a command line argument for the configure script of "--with-gtk3" to
attempt to compile against GTK+ 3.0 (which can be installed at the same
time as GTK+ 2.0).  Also place a copy of the autoconf macro for finding
GTK+ 3.0 in the aclocal-fallback directory taken from the GTK+ 3.0
distribution.

(Note: Wireshark won't finish compiling with GTK+ 3.0 yet...)


svn path=/trunk/; revision=35918
2011-02-11 20:21:32 +00:00
Balint Reczey 789089dfd2 Detect gnutls via pkg-config instead of the deprecated libgnutls-config.
Based on patch from Andreas Metzler.
This fixes bug 3627.

svn path=/trunk/; revision=28874
2009-06-28 16:31:27 +00:00
Stephen Fisher ba166ad36d Remove aclocal-fallback m4 files that were used to check for GTK and GLIB v1.
Their v2 counterparts remain.


svn path=/trunk/; revision=26512
2008-10-22 05:31:36 +00:00
Stig Bjørlykke f0b7e2ebe1 Also check in $prefix for libsmi.
svn path=/trunk/; revision=25976
2008-08-10 15:37:39 +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
Anders Broman e8a75e9ee1 From Peter Fuller:
libsmi.m4 had a typo in ldflags that broke LDFLAG settings when --with-libsmi was used

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

svn path=/trunk/; revision=25503
2008-06-21 13:12:19 +00:00
Jörg Mayer b399750316 Fix complaint by newer autofoo tools
svn path=/trunk/; revision=23908
2007-12-18 00:46:18 +00:00
Gerald Combs 36f0b417ea Add a directory argument and some default directories to "configure
--with-libsmi".

svn path=/trunk/; revision=23676
2007-11-30 00:45:12 +00:00
Luis Ontanon 782c19a0c5 get libsmi into the picture
svn path=/trunk/; revision=22661
2007-08-25 20:27:58 +00:00
Jeff Morriss ead6372797 From Jess Balint: modern versions of pkg-config want --cflags or --libs *before* the library we're asking about
svn path=/trunk/; revision=22365
2007-07-20 19:11:57 +00:00
Gerald Combs a832d689c6 Under Solaris (9, at least) the "iconv.h" header supplied with GNU libiconv
is incompatible with the iconv routines in libc.  Add an aclocal macro from
Bruno Haible that sorts everything out.

svn path=/trunk/; revision=18729
2006-07-13 18:17:32 +00:00
Jörg Mayer 60a546c1cf autofoo will fail on systems that lack libgcrypt.m4.
Provide one in aclocal-fallback. While I'm at it: Remove
the libgnutls.m4 stuff from acinclude and provide it in
aclocal-fallback as well.


svn path=/trunk/; revision=18475
2006-06-15 20:25:01 +00:00
Jörg Mayer 4435171600 Fix some aclocal warnings during autogen.sh
svn path=/trunk/; revision=10508
2004-03-27 12:14:17 +00:00
Jörg Mayer 2bdb0230e5 Implement an alternative method to provide missing aclocal files:
Check if a development file for the package is present and install
the corresponding m4 file in aclocal-missing if it isn't.

Add glib, glib-2.0 and gtk-2.0 to the fallback directory.

svn path=/trunk/; revision=6102
2002-08-27 23:00:04 +00:00
Jörg Mayer 365bb11df4 Allow running autogen.sh on systems that do not have gtk.m4 installed.
That way it should be possible to build tethereal from cvs. Also,
Fallback files may be added to the aclocal-fallback/ directory in case
other optional packages come up.

svn path=/trunk/; revision=6071
2002-08-23 21:12:32 +00:00