summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-06 18:03:07 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-06 07:48:16 +0000
commit58c1d0c256c8bfedf6a1a734bfba34c637f34035 (patch)
treeef22e655c87e3d2def10bd35d84271bcbdfbad20
parent1e267b03da3d00bac20b518e620a03faadee5005 (diff)
downloadsamba-58c1d0c256c8bfedf6a1a734bfba34c637f34035.tar.gz
samba-58c1d0c256c8bfedf6a1a734bfba34c637f34035.tar.bz2
samba-58c1d0c256c8bfedf6a1a734bfba34c637f34035.zip
s4-heimdal: disable using the system compile_et for now
just checking that compile_et exists isn't enough. It has to actually work. Quite a few build farm systems have /usr/bin/compile_et, but it gets link errors when you try to use it (missing symbols et_list_lock and et_list_unlock) Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Wed Oct 6 07:48:16 UTC 2010 on sn-devel-104
-rw-r--r--source4/heimdal_build/wscript_configure7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index e8f258ca46..78b0df5063 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -63,5 +63,8 @@ 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)
-if conf.find_program('compile_et', var='COMPILE_ET'):
- conf.define('USING_SYSTEM_COMPILE_ET', 1)
+# 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
+# results in missing symbols (eg. OpenSUSE 10.2 'opi' in the build farm)
+#if conf.find_program('compile_et', var='COMPILE_ET'):
+# conf.define('USING_SYSTEM_COMPILE_ET', 1)