Patch GnuTLS's pkg-config file; it says "requires zlib", but OS X, while
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 15 Jul 2011 23:26:22 +0000 (23:26 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 15 Jul 2011 23:26:22 +0000 (23:26 +0000)
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38055 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.am
macosx-setup.sh
macosx-support-lib-patches/gnutls-pkgconfig.patch [new file with mode: 0644]

index 910a23e7429d4dd266ee83c1fc66ba3a41d26dd1..fd9130cfbf7ba9c3a97cc3e0982b16394b85a055 100644 (file)
@@ -796,6 +796,7 @@ EXTRA_DIST = \
        macosx-setup.sh         \
        macosx-support-lib-patches/glib-gconvert.patch \
        macosx-support-lib-patches/glib-pkgconfig.patch \
+       macosx-support-lib-patches/gnutls-pkgconfig.patch \
        make-version.pl         \
        manuf                   \
        manuf.tmpl              \
index b75cb596d7b5f01f6ad6bfc4122c3a1a2cb0358d..b0625351565a5212d4d1da0c72dfdb1073b29d36 100755 (executable)
@@ -277,6 +277,14 @@ then
        #
        ./configure --with-libgcrypt || exit 1
        make -j 3 || exit 1
+       #
+       # The pkgconfig file for GnuTLS says "requires zlib", but OS X,
+       # while it supplies zlib, doesn't supply a pkgconfig file for
+       # it.
+       #
+       # Patch the GnuTLS pkgconfig file not to require zlib.
+       #
+       patch -p0 lib/gnutls.pc <../../macosx-support-lib-patches/gnutls-pkgconfig.patch || exit 1
        $DO_MAKE_INSTALL || exit 1
        cd ..
 fi
@@ -319,7 +327,6 @@ fi
 echo ""
 
 echo "You are now prepared to build Wireshark. To do so do:"
-echo "Download Wireshark source"
 echo "./autogen.sh"
 echo "./configure"
 echo "make -j 3"
diff --git a/macosx-support-lib-patches/gnutls-pkgconfig.patch b/macosx-support-lib-patches/gnutls-pkgconfig.patch
new file mode 100644 (file)
index 0000000..e599afd
--- /dev/null
@@ -0,0 +1,10 @@
+*** gnutls.pc.orig     2011-07-15 15:02:32.000000000 -0700
+--- gnutls.pc  2011-07-15 15:02:42.000000000 -0700
+***************
+*** 21,25 ****
+  Version: 2.12.7
+  Libs: -L${libdir} -lgnutls
+  Libs.private: -L/usr/local/lib -lgcrypt -L/usr/local/lib -lgpg-error -L/usr/local/lib -lintl -liconv -lc -R/usr/local/lib 
+- Requires.private: zlib
+  Cflags: -I${includedir}
+--- 21,24 ----