Commit Graph

32 Commits

Author SHA1 Message Date
Gerald Combs aaa3e82bff From Dirk Jagdmann via bug 7525: macosx-setup.sh improvements.
svn path=/trunk/; revision=49995
2013-06-17 23:30:56 +00:00
Michael Tüxen 222b0ea7e0 Allow for building 32-bit versions of the libraries used by wireshark.
This allows to build a 32-bit version of wireshark.


svn path=/trunk/; revision=49263
2013-05-13 11:46:16 +00:00
Michael Tüxen 0823a10579 Use more recent versions of various libs.
svn path=/trunk/; revision=48573
2013-03-26 22:47:41 +00:00
Guy Harris e03896a364 Current version of pkg-config is 0.27.
Update some comments.

svn path=/trunk/; revision=47435
2013-02-02 03:43:44 +00:00
Guy Harris 2f701389b0 2.24.5 is not 2.24.25. HTH.
svn path=/trunk/; revision=47207
2013-01-22 06:10:05 +00:00
Guy Harris bd8513f532 Rename MACOSX_VERSION to DARWIN_MAJOR_VERSION to reflect what it
actually is (it's not an OS X version number, e.g. 10.7 for Leopard,
it's a Darwin version number, e.g. 9 for Leopard).  Add comments before
checks to indicate what we're checking for.

Put in a big long comment giving details about the issues I ran into
when trying to make this work on Leopard.

Fail if you try to run this on anything before Snow Leopard - note that
I said "trying" in the previous comment, and, yes, it was a very trying
experience....

Bump the libpng version - 1.5.12 isn't available any more.

Add some comments explaining why the code for Leopard was downloading
and installing libpng and libpixman.

Add some code to handle packages where older versions weren't compressed
with xz and newer versions were.

Add a hack to avoid finding the version of libpng that comes with X11
when trying to build Cairo on Leopard.

svn path=/trunk/; revision=47206
2013-01-22 05:07:23 +00:00
Guy Harris 61b70c94c9 Fix some issues that showed up when building on Mountain Lion, and
update the README.macos file.

svn path=/trunk/; revision=44810
2012-09-08 03:10:03 +00:00
Guy Harris d0f32eea23 At least with the version of Xcode that comes with Leopard,
/usr/include/ffi/fficonfig.h doesn't define MACOSX, which causes the
build of GLib to fail.  If we don't find "#define.*MACOSX" in
/usr/include/ffi/fficonfig.h, explictly define it.

svn path=/trunk/; revision=44693
2012-08-29 10:31:29 +00:00
Guy Harris 0843cfd108 Expand the "why we need to build Cairo in some cases" comment, and put
it before the checks for whether to build Cairo.

svn path=/trunk/; revision=44471
2012-08-13 16:38:25 +00:00
Michael Tüxen 2fdacf0d0d Build cairo on Leopard too.
svn path=/trunk/; revision=44468
2012-08-13 11:54:37 +00:00
Michael Tüxen 53f8694977 Update libpng version.
svn path=/trunk/; revision=44467
2012-08-13 11:51:32 +00:00
Guy Harris 16b161df6a Fix an apparently out-of-date comment.
svn path=/trunk/; revision=44458
2012-08-12 19:51:04 +00:00
Guy Harris 9d4ab6a4f4 Patching configure.in files and regenerating them is a bag of hurt, as
it can depend on, among other things, having the the relevant .pc files
in one of the directories in PKG_CONFIG_PATH.  Instead, just don't
request a fat build of PortAudio.

svn path=/trunk/; revision=44457
2012-08-12 19:32:46 +00:00
Guy Harris 8bec02eb33 Add some patches to make PortAudio build with the macosx-setup.sh
script.

svn path=/trunk/; revision=44446
2012-08-11 23:03:06 +00:00
Jörg Mayer 2602372010 Add a comment to prevent acidentally bumping lua version to 5.2 again.
svn path=/trunk/; revision=43366
2012-06-19 14:48:36 +00:00
Jörg Mayer 2a58400811 Downgrade Lua from 5.2.1 to 5.1.5: Lua 5.2 is API incompatible
with Lua 5.1.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7373

svn path=/trunk/; revision=43358
2012-06-19 13:31:49 +00:00
Jörg Mayer ffdddb1228 update lua 5.2.0 -> 5.2.1
svn path=/trunk/; revision=43306
2012-06-17 12:07:46 +00:00
Jörg Mayer 2d935ea939 - Update cmake, gnutls and pixman to current version
- unpack an xz file with xzcat instead of gzcat
- remove some trailing whitespace
- the update of gnutls required two changes in the gnutls
  build stuff: a) gnutls.pc is now generated from gnutls.pc.in
  and b) we now need to build with --without-p11-kit

svn path=/trunk/; revision=42861
2012-05-27 10:15:56 +00:00
Michael Tüxen 892f054257 Use some newer versions.
svn path=/trunk/; revision=42687
2012-05-17 20:49:09 +00:00
Michael Tüxen 5ccba8f2d3 Bump some version numbers.
svn path=/trunk/; revision=41551
2012-03-14 19:14:29 +00:00
Michael Tüxen 4e58ec540f Update to glib 2.31.20.
One patch is not required anymore, since it has been included.

svn path=/trunk/; revision=41546
2012-03-14 16:56:20 +00:00
Jörg Mayer 624de2e37f Fix bootstrap parameters for cmake
Conditionally display build instructions for the cmake case

svn path=/trunk/; revision=40528
2012-01-16 00:05:14 +00:00
Jörg Mayer d038e58987 Optionally build cmake, document why we need xz
svn path=/trunk/; revision=40498
2012-01-14 14:40:58 +00:00
Jörg Mayer 882d76f2b9 - Update the graphical packages
- Newer versions of glib etc require xz. At least Snow Leopard
  does not provide xz, so (unconditionally) download and install this first.
- Put in infrastructure to set up a GTK3 environment instead of GTK2
  (not active by default because configure'ing Wireshark still fails for some
  reason with GTK3 installed).

svn path=/trunk/; revision=40352
2011-12-31 16:20:47 +00:00
Michael Tüxen 08a00ee1da Update some support libs to newer version.
svn path=/trunk/; revision=40145
2011-12-10 09:48:59 +00:00
Guy Harris 56903273cc Expand a comment.
svn path=/trunk/; revision=39953
2011-11-20 03:15:53 +00:00
Guy Harris 03194fa270 Move the GeoIP entry where it belongs.
Expand a couple of comments.

svn path=/trunk/; revision=39317
2011-10-08 19:44:36 +00:00
Jörg Mayer 432ca372bd Remove a duplicate entry
svn path=/trunk/; revision=39310
2011-10-08 15:17:56 +00:00
Guy Harris fb162bf95f Xcode 4 isn't available on DVD, but is available for download from
developer.apple.com, and the current version is available, at least for
Lion, from the Mac App Store.

While we're at it, make sure the X11 SDK is present, by checking for
/usr/X11/include.

svn path=/trunk/; revision=38712
2011-08-24 10:18:25 +00:00
Guy Harris 2e2dc7179f Work around an annoying problem caused by the collision of GNU gettext's
configure script's attempts to deal with AIX 4 and Lion and/or Xcode 4's
dealings with Fortify.

svn path=/trunk/; revision=38104
2011-07-19 02:29:31 +00:00
Guy Harris 9659cc77e8 Patch GnuTLS's pkg-config file; it says "requires zlib", but OS X, while
it supplies zlib, doesn't supply a pkgconfig file for it, so we don't
want it to say "requires zlib".

This script is part of the Wireshark source, so giving "download
Wireshark source" as the next step doesn't make sense.

svn path=/trunk/; revision=38055
2011-07-15 23:26:22 +00:00
Guy Harris b273aad66e Add Joerg Mayer's macos-setup.sh script, modified to add an "x" after
"macos", to fix some bugs, to use "sudo" if necessary when installing,
to make the library version numbers variables, and to download the
optional libraries, by default, as well.  Also add his patches to make
GLib build and work.

Update README.macos to reflect that.

svn path=/trunk/; revision=38053
2011-07-15 21:48:02 +00:00