Reverse order of paths added to get reliable builds. BUG: https://bugzilla.samba.org/show_bug.cgi?id=9890 Index: buildtools/wafsamba/samba_conftests.py --- buildtools/wafsamba/samba_conftests.py.orig +++ buildtools/wafsamba/samba_conftests.py @@ -40,9 +40,9 @@ def check(self, *k, **kw): def add_options_dir(dirs, env): for x in dirs: if not x in env.CPPPATH: - env.CPPPATH = [os.path.join(x, 'include')] + env.CPPPATH + env.CPPPATH = env.CPPPATH + [os.path.join(x, 'include')] if not x in env.LIBPATH: - env.LIBPATH = [os.path.join(x, 'lib')] + env.LIBPATH + env.LIBPATH = env.LIBPATH + [os.path.join(x, 'lib')] add_options_dir(additional_dirs, kw['env'])