Commit Graph

115 Commits

Author SHA1 Message Date
Jörg Mayer 18155bd148 Change default gtk build from version 2 to version 3 for
autotool, cmake and nmake.
No idea what it takes to change the visual project stuff

svn path=/trunk/; revision=50863
2013-07-24 11:51:10 +00:00
Martin Kaiser cc82d38c8b set HAVE_GETOPT_H and HAVE_GETOPT variables
for both autotools and cmake builds

(in order to use getopt_long(), we have to check if we
 can include getopt.h)

svn path=/trunk/; revision=50680
2013-07-16 21:12:12 +00:00
Evan Huus 66f7521a17 Revert r50150. I suspect the problem was Ubuntu's transition to qt5 as default,
since now the defaults work as they should.

svn path=/trunk/; revision=50644
2013-07-15 23:47:11 +00:00
Guy Harris bc239a7286 On OS X, set the rpath for executables to include
@executable_path/../lib as well as /usr/local/lib, so we can use @rpath
in the install names in the executables and libraries in the application
bundle.

Have the osx-app.sh script tweak all references to libraries from
/usr/local/lib in all executables, libraries, and plugins in the app
bundle to use @rpath.  (The "all" is important; it fixes the GTK+ crash
mentioned in the comment in osx-app.sh.  The notion of doing all of them
came from the osx-app.sh script in a newer version of Inkscape.)

This renders the setting of DYLD_LIBRARY_PATH in the wrapper scripts in
the bundle unnecessary; remove it.  (Ideally, we should try to get rid
of the wrapper scripts entirely, but that might have to wait for us to
switch to using Qt.)

svn path=/trunk/; revision=50560
2013-07-13 22:43:35 +00:00
Guy Harris 5967dc6820 CPPFLAGS contains the flags for the C preprocessor; CXXFLAGS contains
the flags for the C++ compiler.

If we're building for 10.5, force a 32-bit build.

svn path=/trunk/; revision=50459
2013-07-09 08:48:07 +00:00
Guy Harris 2cc0fb0917 Clean up comments.
svn path=/trunk/; revision=50440
2013-07-07 21:38:04 +00:00
Guy Harris a39004e4aa Check for an OS X deployment target early, so that as many
tests using the compiler are done using the flags that
we'll be using when building.

Add a -mmacosx-version-min flag to CFLAGS/CPPFLAGS/LDFLAGS so that the
compiler tests use them.  This may, or may not, obviate the need to set
MACOSX_DEPLOYMENT_TARGET in OSX_DEPLOY_TARGET.

svn path=/trunk/; revision=50426
2013-07-06 23:29:50 +00:00
Guy Harris 519c5affa2 Add a --enable-osx-deploy-target option to set the deployment target
when building for OS X; that causes the MACOSX_DEPLOYMENT_TARGET
environment variable to be set when building (so that, for example, we
don't use linker features available on the version on which we're
building but not on the minimum OS version for which we're building),
and causes the SDK for that version to be used (so that, for example, we
don't link with libraries with later version numbers than the ones
provided with the OS version for which we're building).

svn path=/trunk/; revision=50410
2013-07-06 16:42:30 +00:00
Guy Harris 70075fa70f Rename AC_WIRESHARK_GCC_CFLAGS_CHECK to
AC_WIRESHARK_COMPILER_FLAGS_CHECK, because it doesn't just affect CFLAGS
and it doesn't just affect the flags for GCC.

svn path=/trunk/; revision=50222
2013-06-28 22:00:52 +00:00
Guy Harris c0fa736323 Do the "is $CXX actually a C++ compiler" test as early as possible, so
that it doesn't fail due to the C++ compiler not supporting -W options
that the C compiler does.

(We should fix that, too, by having separate checks for whether the C
and C++ compilers support particular options.)

svn path=/trunk/; revision=50215
2013-06-28 19:34:35 +00:00
Jeff Morriss 8c826964bf Standard C++ header files don't have .h in their name: #include <iostream>
rather than #include <iostream.h>.

Also reference cout as std::cout in the test program.

svn path=/trunk/; revision=50206
2013-06-28 12:18:03 +00:00
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