author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
Sat, 30 May 2015 14:41:57 -0700 | |
changeset 4433 | d35242d8330c |
permissions | -rw-r--r-- |
4433
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
1 |
7092513 Samba links liblber from openldap but should not do it. |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
2 |
|
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
--- a/source3/configure.in-bkp 2011-09-19 09:34:22.632025100 -0700 |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ b/source3/configure.in 2011-09-19 09:37:16.235176200 -0700 |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -3285,7 +3285,10 @@ |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
################################################################## |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
# we might need the lber lib on some systems. To avoid link errors |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
# this test must be before the libldap test |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
- AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf) |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
+ # The next test should be avoided because libldap60 already have (internal) |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
+ # ber_scanf but the liblber from openldap is searched first so liblber |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
+ # is added into LDAP_LIBS |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
+ #AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf) |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
|
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
######################################################## |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
# If ber_sockbuf_add_io() is available we can add |