[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1d5f3c1 s4:ldb: don't install .pc files when building a private library
      from  46384cf headers: cope with non-system popt in test_headers

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


- Log -----------------------------------------------------------------
commit 1d5f3c11df95b9a4f846a7122d1aab354a42dd3a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 14 08:37:31 2011 +0100

    s4:ldb: don't install .pc files when building a private library
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Mar 16 09:58:22 CET 2011 on sn-devel-104

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

Summary of changes:
 source4/lib/ldb/wscript |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 6bec747..df08f87 100755
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -73,8 +73,12 @@ def build(bld):
 
     if bld.env.standalone_ldb:
         private_library = False
+        ldb_pc_files='ldb.pc'
+        pyldb_pc_files='pyldb-util.pc'
     else:
         private_library = True
+        ldb_pc_files=None
+        pyldb_pc_files=None
 
     LDB_MAP_SRC = bld.SUBDIR('ldb_map',
                              'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c')
@@ -108,7 +112,7 @@ def build(bld):
                           public_headers_install=not private_library,
                           vnum=VERSION,
                           private_library=private_library,
-                          pc_files='pyldb-util.pc',
+                          pc_files=pyldb_pc_files,
                           pyext=True)
 
     if not bld.CONFIG_SET('USING_SYSTEM_LDB'):
@@ -128,7 +132,7 @@ def build(bld):
                           public_headers='include/ldb.h include/ldb_errors.h '\
                           'include/ldb_module.h include/ldb_handlers.h',
                           public_headers_install=not private_library,
-                          pc_files='ldb.pc',
+                          pc_files=ldb_pc_files,
                           vnum=VERSION,
                           private_library=private_library,
                           manpages='man/ldb.3',


-- 
Samba Shared Repository