--- a/source3/wscript	2016-06-06 00:40:23.000000000 -0700
+++ b/source3/wscript	2016-08-07 10:58:34.314062853 -0700
@@ -665,24 +665,28 @@
 
     # Check for LDAP
     if Options.options.with_ldap:
-        conf.CHECK_HEADERS('ldap.h lber.h ldap_pvt.h')
-        conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
-        conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber')
-        conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h')
+        conf.CHECK_CFG(package='ldap', args="--cflags --libs", msg='Check for ldap', uselib_store="LDAP")
+        conf.SET_TARGET_TYPE('ldap', 'SYSLIB')
+        conf.CHECK_CFG(package='lber', args="--cflags --libs", msg='Check for lber', uselib_store="LBER")
+        conf.SET_TARGET_TYPE('lber', 'SYSLIB')
+        conf.CHECK_HEADERS('ldap.h lber.h ldap_pvt.h', lib='ldap')
+        conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h', lib='ldap')
+        conf.CHECK_FUNCS('ber_scanf ber_sockbuf_add_io', lib='ldap')
+        conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h', lib='ldap')
 
         # if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print it out
         # for the samba logs
         conf.CHECK_VARIABLE('LBER_OPT_LOG_PRINT_FN',
-                            define='HAVE_LBER_LOG_PRINT_FN', headers='lber.h')
+                            define='HAVE_LBER_LOG_PRINT_FN', headers='lber.h', lib='ldap')
 
-        conf.CHECK_FUNCS_IN('ldap_init ldap_init_fd ldap_initialize ldap_set_rebind_proc', 'ldap')
-        conf.CHECK_FUNCS_IN('ldap_add_result_entry', 'ldap')
+        conf.CHECK_FUNCS('ldap_init ldap_init_fd ldap_initialize ldap_set_rebind_proc', lib='ldap')
+        conf.CHECK_FUNCS('ldap_add_result_entry', lib='ldap')
 
         # Check if ldap_set_rebind_proc() takes three arguments
         if conf.CHECK_CODE('ldap_set_rebind_proc(0, 0, 0)',
                            'LDAP_SET_REBIND_PROC_ARGS',
                            msg="Checking whether ldap_set_rebind_proc takes 3 arguments",
-                           headers='ldap.h lber.h', link=False):
+                           headers='ldap.h lber.h', link=False, lib='ldap'):
             conf.DEFINE('LDAP_SET_REBIND_PROC_ARGS', '3')
         else:
             conf.DEFINE('LDAP_SET_REBIND_PROC_ARGS', '2')