up to 3.7.4 (new libgnutlsxx soname)

[packages/gnutls.git] / gnutls-link.patch

diff --git a/gnutls-link.patch b/gnutls-link.patch
index 7e42c9a0fa720a974c350c564b9a9ebf8c206e03..fb14acdcec6fd0b7d3820b69e2a102dc4c4e9793 100644 (file)
--- a/gnutls-link.patch
+++ b/gnutls-link.patch
@@ -1,20 +1,14 @@
---- gnutls-2.2.1/libextra/Makefile.am.orig     2008-01-17 18:45:55.000000000 +0100
-+++ gnutls-2.2.1/libextra/Makefile.am  2008-01-21 21:15:31.324404586 +0100
-@@ -60,7 +60,7 @@
- 
- libgnutls_extra_la_SOURCES = gnutls_extra.c
- 
--libgnutls_openssl_la_LDFLAGS = -no-undefined -L$(top_srcdir)/lib/.libs
-+libgnutls_openssl_la_LDFLAGS = -no-undefined
- 
- # OpenSSL
- 
-@@ -90,7 +90,7 @@
- # OpenPGP
- 
- libgnutls_extra_la_LIBADD =
--libgnutls_extra_la_LDFLAGS = -no-undefined -L$(top_srcdir)/lib/.libs
-+libgnutls_extra_la_LDFLAGS = -no-undefined
- if ENABLE_OPENPGP
- libgnutls_extra_la_SOURCES += gnutls_openpgp.c
- libgnutls_extra_la_LIBADD += openpgp/libgnutls_openpgp.la
+--- gnutls-3.5.6/m4/lib-link.m4.orig   2008-05-17 07:44:04.000000000 +0200
++++ gnutls-3.5.6/m4/lib-link.m4        2011-04-02 11:29:18.159546509 +0200
+@@ -322,7 +322,11 @@
+           fi
+           if test "X$found_dir" != "X"; then
+             dnl Found the library.
++            if test "X$found_dir" = "X/usr/$acl_libdirstem"; then
++                LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
++          else
+             LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
++          fi
+             if test "X$found_so" != "X"; then
+               dnl Linking with a shared library. We attempt to hardcode its
+               dnl directory into the executable's runpath, unless it's the