components/samba/samba/patches/xtra-conf.in-liblber-avoid.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 29 May 2015 15:30:36 -0700
changeset 4377 b861470645e4
permissions -rw-r--r--
backout 18462092 - needs more work
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4377
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     1
7092513 Samba links liblber from openldap but should not do it.
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     2
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     3
--- a/source3/configure.in-bkp	2011-09-19 09:34:22.632025100 -0700
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     4
+++ b/source3/configure.in	2011-09-19 09:37:16.235176200 -0700
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     5
@@ -3285,7 +3285,10 @@
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     6
   ##################################################################
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     7
   # we might need the lber lib on some systems. To avoid link errors
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     8
   # this test must be before the libldap test
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     9
-  AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf)
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    10
+ # The next test should be avoided because libldap60 already have (internal)
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    11
+ # ber_scanf but the liblber from openldap is searched first so liblber
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    12
+ # is added into LDAP_LIBS
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    13
+  #AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf)
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    14
 
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    15
   ########################################################
b861470645e4 backout 18462092 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    16
   # If ber_sockbuf_add_io() is available we can add