[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  3992182 popt: Check for popt manually as well, not just using pkg-config.
      from  f260596 nsstest: Allocate the correct sized buffer for initgroups

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


- Log -----------------------------------------------------------------
commit 3992182fec4d46d4340fe038b7d3386b78701857
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 20 13:40:52 2012 +0100

    popt: Check for popt manually as well, not just using pkg-config.
    
    Older systems don't provide a pkg-config file for popt.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Mon Feb 20 15:13:32 CET 2012 on sn-devel-104

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

Summary of changes:
 lib/popt/wscript |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/popt/wscript b/lib/popt/wscript
index 6aa8e70..7fd15ed 100644
--- a/lib/popt/wscript
+++ b/lib/popt/wscript
@@ -5,7 +5,7 @@ import Options
 def configure(conf):
     conf.CHECK_HEADERS('float.h')
 
-    if conf.CHECK_BUNDLED_SYSTEM_PKG('popt'):
+    if conf.CHECK_BUNDLED_SYSTEM('popt', checkfunctions='poptGetContext', headers='popt.h'):
         conf.define('USING_SYSTEM_POPT', 1)
 
 def build(bld):


-- 
Samba Shared Repository