--- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
+++ buildtools/wafsamba/wscript
@@ -74,12 +74,17 @@ def set_options(opt):
                    help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
                    action="store", dest='PRIVATELIBDIR', default=None)
 
+    opt.add_option('--with-openldap',
+                   help='additional directory to search for OpenLDAP libs',
+                   action='store', dest='ldap_open', default=None,
+                   match = ['Checking for library lber', 'Checking for library ldap'])
+
     opt.add_option('--with-libiconv',
                    help='additional directory to search for libiconv',
-                   action='store', dest='iconv_open', default='/usr/local',
+                   action='store', dest='iconv_open', default=None,
                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
     opt.add_option('--without-gettext',
-                   help=("Disable use of gettext"),
+                   help=("disable use of gettext"),
                    action="store_true", dest='disable_gettext', default=False)
 
     gr = opt.option_group('developer options')