[SCM] Samba Shared Repository - branch master updated

[Alexander Bokovoy]

The branch, master has been updated
       via  886f062 s4-torture: Always compile backupkey ndr testsuite.
       via  b48ceef waf: build PIEs if supported by the compiler
      from  d86fda9 autobuild: remove remnants of removed samba3 targets

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


- Log -----------------------------------------------------------------
commit 886f062e72f8ad9cddfe5fab4b2b1a36be0ea30b
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 27 14:15:08 2013 +0200

    s4-torture: Always compile backupkey ndr testsuite.
    
    This removes another incorrect AD_DC_BUILD_IS_ENABLED check ifdef check. The ndr
    test is not at all heimdal specific.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
    Autobuild-Date(master): Wed May 29 11:29:51 CEST 2013 on sn-devel-104

commit b48ceef1d3031ec72018dc9bad1cf0dcb9864a56
Author: David Disseldorp <ddiss at samba.org>
Date:   Tue May 28 15:11:45 2013 +0200

    waf: build PIEs if supported by the compiler
    
    Currently waf performs a mandatory check for compiler PIE support,
    unless --without-pie is specified.
    This change makes Waf only perform the mandatory check if --with-pie is
    specified. If neither --with-pie nor --without-pie are specified, then
    PIEs are only built if compiler support is available.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

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

Summary of changes:
 source4/torture/ndr/ndr.c     |    2 --
 source4/torture/wscript_build |    3 +--
 wscript                       |   18 ++++++++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index 9e63ff7..1b0f968 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -398,9 +398,7 @@ struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx)
 	torture_suite_add_suite(suite, ndr_drsblobs_suite(suite));
 	torture_suite_add_suite(suite, ndr_nbt_suite(suite));
 	torture_suite_add_suite(suite, ndr_ntlmssp_suite(suite));
-#ifdef AD_DC_BUILD_IS_ENABLED /* Add Heimdal-specific KDC test */
 	torture_suite_add_suite(suite, ndr_backupkey_suite(suite));
-#endif
 	torture_suite_add_suite(suite, ndr_string_suite(suite));
 
 	torture_suite_add_simple_test(suite, "string terminator",
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index be82610..c3c997a 100755
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -36,12 +36,11 @@ heimdal_specific = dict()
 heimdal_specific['ndr'] = ('','')
 heimdal_specific['rpc'] = ('','')
 if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
-	heimdal_specific['ndr'] = (' ndr/backupkey.c','')
 	heimdal_specific['rpc'] = (' rpc/backupkey.c rpc/spoolss_notify.c',
 				    ' RPC_NDR_BACKUPKEY SMB_SERVER dcerpc_server ntvfs')
 
 bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
-	source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/string.c'+heimdal_specific['ndr'][0],
+	source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/string.c ndr/backupkey.c',
 	autoproto='ndr/proto.h',
 	deps='torture'
 	)
diff --git a/wscript b/wscript
index efebfc4..83c82e3 100644
--- a/wscript
+++ b/wscript
@@ -57,8 +57,9 @@ def set_options(opt):
                    action='store_true', dest='without_ad_dc', default=False)
 
     opt.add_option('--with-pie',
-                  help=("Build Position Independent Executables (default)"),
-                  action="store_true", dest='enable_pie', default=True)
+                  help=("Build Position Independent Executables " +
+                        "(default if supported by compiler)"),
+                  action="store_true", dest='enable_pie')
     opt.add_option('--without-pie',
                   help=("Disable Position Independent Executable builds"),
                   action="store_false", dest='enable_pie')
@@ -167,10 +168,15 @@ def configure(conf):
     
     conf.SAMBA_CONFIG_H('include/config.h')
 
-    if Options.options.enable_pie == True:
-        conf.check_cc(cflags='-fPIE', ldflags='-pie', mandatory=True,
-                      msg="Checking compiler for PIE support")
-        conf.env['ENABLE_PIE'] = True
+    if Options.options.enable_pie != False:
+        if Options.options.enable_pie == True:
+                need_pie = True
+        else:
+                # not specified, only build PIEs if supported by compiler
+                need_pie = False
+        if conf.check_cc(cflags='-fPIE', ldflags='-pie', mandatory=need_pie,
+                         msg="Checking compiler for PIE support"):
+		conf.env['ENABLE_PIE'] = True
 
 def etags(ctx):
     '''build TAGS file using etags'''


-- 
Samba Shared Repository