diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-09 04:41:34 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-09 04:41:34 +0000 |
| commit | ff15b893d8eb858a6a2da1882bb5d8ace9db2b24 (patch) | |
| tree | ee7df2e059fb74cd4de5d661a5af923d9b434e81 /Makefile.am | |
| parent | bbf7636e613bd66461ceb05d79c1d97cfe8c65f2 (diff) | |
| download | wireshark-ff15b893d8eb858a6a2da1882bb5d8ace9db2b24.tar.gz wireshark-ff15b893d8eb858a6a2da1882bb5d8ace9db2b24.tar.bz2 wireshark-ff15b893d8eb858a6a2da1882bb5d8ace9db2b24.zip | |
Use older versions of some libraries, and build 32-bit, when building
for Leopard. Fix some issues that came up with the older versions.
We don't support building *on* Leopard - we check for that up front - so
eliminate some code to handle that.
When uninstalling, check for the installed version by looking at the
name of the -done file, so we don't have to trust the _VERSION settings.
We don't appear to need to build our own versions of libpng or pixman
when building *on* Snow Leopard *for* Leopard.
The libffi configure patch for GLib appears not to be necessary -
perhaps building and installing pkg-config *before* building GLib makes
it no longer necessary - and it doesn't work with older versions of
GLib, so don't apply it.
svn path=/trunk/; revision=50456
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index f594530a65..15f3af0bbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -926,6 +926,7 @@ EXTRA_DIST = \ image/wssplash.png \ ipmap.html \ macosx-setup.sh \ + macosx-support-lib-patches/glib-gconvert.c.patch \ macosx-support-lib-patches/glib-pkgconfig.patch \ macosx-support-lib-patches/gnutls-pkgconfig.patch \ macosx-support-lib-patches/portaudio-pa_mac_core.h.patch \ |