heimdal: Support using system roken.

1 files changed, 5 insertions, 4 deletions

diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 727344c3b4..b51bc71661 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -65,18 +65,19 @@ conf.DEFINE('SAMBA4_INTERNAL_HEIMDAL', 1)
 if conf.CHECK_BUNDLED_SYSTEM('com_err', checkfunctions='com_right_r com_err', headers='com_err.h'):
     conf.define('USING_SYSTEM_COM_ERR', 1)
 
-def check_bundled_heimdal_lib(name, functions, headers):
+def check_bundled_heimdal_lib(name, functions='', headers='', onlyif=None):
     # Only use system library if the user requested the bundled one not be used.
     if conf.LIB_MAY_BE_BUNDLED(name):
         return
-    lib = name
     setattr(conf.env, "CPPPATH_%s" % name.upper(), ["/usr/include/heimdal"])
     setattr(conf.env, "LIBPATH_%s" % name.upper(), ["/usr/lib/heimdal"])
-    conf.CHECK_BUNDLED_SYSTEM("wind", checkfunctions=functions, headers=headers)
+    conf.CHECK_BUNDLED_SYSTEM(name, checkfunctions=functions, headers=headers,
+        onlyif=onlyif)
     conf.define('USING_SYSTEM_%s' % name.upper(), 1)
 
 
-check_bundled_heimdal_lib("wind", "wind_stringprep", "wind.h")
+check_bundled_heimdal_lib("roken")
+check_bundled_heimdal_lib("wind", "wind_stringprep", "wind.h", onlyif="roken")
 
 # disable trying to use an external compile_et until we have a configure
 # test that checks that the system one actually works. On some systems it