blob: 1f0ca88fae6e82b575fc95101866b4cccf209121 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- a/configure.in
+++ b/configure.in
@@ -1214,7 +1214,7 @@ if test $ol_link_tls = no ; then
ol_with_tls=gnutls
ol_link_tls=yes
- TLS_LIBS="-lgnutls"
+ TLS_LIBS="-lgnutls -lgcrypt"
AC_DEFINE(HAVE_GNUTLS, 1,
[define if you have GNUtls])
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -51,21 +51,21 @@ LIB_DEFS = -DLDAP_LIBRARY
XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(TLS_LIBS)
ifneq (,$(VERSION_OPTION))
VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
endif
apitest: $(XLIBS) apitest.o
- $(LTLINK) -o $@ apitest.o $(LIBS)
+ $(LTLINK) -o $@ apitest.o $(LIBS) $(TLS_LIBS)
dntest: $(XLIBS) dntest.o
- $(LTLINK) -o $@ dntest.o $(LIBS)
+ $(LTLINK) -o $@ dntest.o $(LIBS) $(TLS_LIBS)
ftest: $(XLIBS) ftest.o
- $(LTLINK) -o $@ ftest.o $(LIBS)
+ $(LTLINK) -o $@ ftest.o $(LIBS) $(TLS_LIBS)
ltest: $(XLIBS) test.o
- $(LTLINK) -o $@ test.o $(LIBS)
+ $(LTLINK) -o $@ test.o $(LIBS) $(TLS_LIBS)
urltest: $(XLIBS) urltest.o
- $(LTLINK) -o $@ urltest.o $(LIBS)
+ $(LTLINK) -o $@ urltest.o $(LIBS) $(TLS_LIBS)
CFFILES=ldap.conf
--- a/libraries/libldap_r/Makefile.in
+++ b/libraries/libldap_r/Makefile.in
@@ -60,7 +60,7 @@ XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
XXXLIBS = $(LTHREAD_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) $(TLS_LIBS)
ifneq (,$(VERSION_OPTION))
VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map"
endif
@@ -80,9 +80,9 @@ clean-local: FORCE
depend-common: .links
apitest: $(XLIBS) apitest.o
- $(LTLINK) -o $@ apitest.o $(LIBS)
+ $(LTLINK) -o $@ apitest.o $(LIBS) $(TLS_LIBS)
ltest: $(XLIBS) test.o
- $(LTLINK) -o $@ test.o $(LIBS)
+ $(LTLINK) -o $@ test.o $(LIBS) $(TLS_LIBS)
install-local: $(CFFILES) FORCE
-$(MKDIR) $(DESTDIR)$(libdir)
|
