libcli/smb: Add smbXcli_conn_nt_smbs_supported

[obnox/samba/samba-obnox.git] / wscript

diff --git a/wscript b/wscript
index 2ff6c35a612cfdb9ea5cf20c28610c895b9478eb..83c82e354087743366c675a8eba949df7badda1f 100644 (file)
--- 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'''
@@ -240,13 +246,6 @@ def dist():
     os.system(srcdir + "/release-scripts/build-manpages-nogit")
     samba_dist.DIST_FILES('bin/docs:docs', extend=True)
 
-    os.system(srcdir + "/source3/autogen.sh")
-    samba_dist.DIST_FILES('source3/configure', extend=True)
-    samba_dist.DIST_FILES('source3/autoconf', extend=True)
-    samba_dist.DIST_FILES('source3/include/autoconf', extend=True)
-    samba_dist.DIST_FILES('examples/VFS/configure', extend=True)
-    samba_dist.DIST_FILES('examples/VFS/module_config.h.in', extend=True)
-
     if sambaversion.IS_SNAPSHOT:
         # write .distversion file and add to tar
         if not os.path.isdir(blddir):