[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  46384cf headers: cope with non-system popt in test_headers
       via  3cfa821 headers: include Python.h first to avoid warnings
      from  9bc14af s3: Fix a cut&paste error in pdb_ads_connect

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


- Log -----------------------------------------------------------------
commit 46384cf60a41ee23927f2f4c26fe9239bdbf154a
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Mar 16 17:42:24 2011 +1100

    headers: cope with non-system popt in test_headers
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Wed Mar 16 09:09:40 CET 2011 on sn-devel-104

commit 3cfa8216b97197694a90833b30aade12586d8a96
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Mar 16 17:42:02 2011 +1100

    headers: include Python.h first to avoid warnings

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

Summary of changes:
 testsuite/headers/test_headers.c |    2 +-
 testsuite/headers/wscript_build  |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/testsuite/headers/test_headers.c b/testsuite/headers/test_headers.c
index c671d73..a36575f 100644
--- a/testsuite/headers/test_headers.c
+++ b/testsuite/headers/test_headers.c
@@ -23,12 +23,12 @@
 
 #define _GNU_SOURCE 1
 
+#include <Python.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <Python.h>
 
 /* pre-include some of the public headers to avoid ordering issues */
 #include "core/ntstatus.h"
diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build
index b2b88fe..f83538e 100644
--- a/testsuite/headers/wscript_build
+++ b/testsuite/headers/wscript_build
@@ -24,11 +24,14 @@ bld.SAMBA_GENERATOR('test_headers.h',
                     target='test_headers.h')
 
 cflags=''
-for lib in ['talloc', 'tevent', 'tdb', 'ldb' ]:
+for lib in ['talloc', 'tevent', 'tdb', 'ldb', 'popt' ]:
     ename = 'CPPPATH_%s' % lib.upper()
     for p in bld.env[ename]:
         cflags += bld.env.CPPPATH_ST % p + ' '
 
+if not bld.env.USING_SYSTEM_POPT:
+    cflags += bld.env.CPPPATH_ST % '../lib/popt'
+
 if bld.env.DEVELOPER_MODE:
     bld.SAMBA_BINARY('test_headers',
                      source='test_headers.c',


-- 
Samba Shared Repository