[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  58c1d0c s4-heimdal: disable using the system compile_et for now
      from  1e267b0 waf: fixed the problem with com_err on Ubuntu 9.04

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 58c1d0c256c8bfedf6a1a734bfba34c637f34035
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Oct 6 18:03:07 2010 +1100

    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 at samba.org>
    Autobuild-Date: Wed Oct  6 07:48:16 UTC 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/heimdal_build/wscript_configure |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index e8f258c..78b0df5 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)


-- 
Samba Shared Repository