]>
Commit | Line | Data |
---|---|---|
4bd8c4e3 JB |
1 | --- gnutls-3.5.1/m4/lib-link.m4.orig 2008-05-17 07:44:04.000000000 +0200 |
2 | +++ gnutls-3.5.1/m4/lib-link.m4 2011-04-02 11:29:18.159546509 +0200 | |
cf4ab563 JB |
3 | @@ -322,7 +322,11 @@ |
4 | fi | |
5 | if test "X$found_dir" != "X"; then | |
6 | dnl Found the library. | |
7 | + if test "X$found_dir" = "X/usr/$acl_libdirstem"; then | |
8 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" | |
9 | + else | |
10 | LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" | |
11 | + fi | |
12 | if test "X$found_so" != "X"; then | |
13 | dnl Linking with a shared library. We attempt to hardcode its | |
14 | dnl directory into the executable's runpath, unless it's the | |
5a5e658f JB |
15 | --- gnutls-3.4.4.1/configure.ac.orig 2015-09-08 18:38:30.228498005 +0200 |
16 | +++ gnutls-3.4.4.1/configure.ac 2015-09-08 18:38:32.501831080 +0200 | |
17 | @@ -515,6 +515,7 @@ | |
18 | Trspi_Error_String(err);])], | |
19 | [AC_MSG_RESULT(yes) | |
20 | AC_SUBST([TSS_LIBS], [-ltspi]) | |
21 | + AC_SUBST([TSS_DL_LIBS], [-ldl]) | |
22 | AC_SUBST([TSS_CFLAGS], []) | |
23 | AC_DEFINE([HAVE_TROUSERS], 1, [Enable TPM]) | |
24 | with_tpm=yes], | |
25 | --- gnutls-3.4.4.1/lib/Makefile.am.orig 2015-07-21 11:42:08.000000000 +0200 | |
26 | +++ gnutls-3.4.4.1/lib/Makefile.am 2015-09-08 18:38:26.635165277 +0200 | |
27 | @@ -137,7 +137,7 @@ | |
28 | auth/libgnutls_auth.la algorithms/libgnutls_alg.la \ | |
29 | extras/libgnutls_extras.la | |
30 | thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBNSL) \ | |
31 | - $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) | |
32 | + $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_DL_LIBS) | |
f271dc1d | 33 | |
5a5e658f JB |
34 | if HAVE_LIBIDN |
35 | thirdparty_libadd += $(LIBIDN_LIBS) |