From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 20 Feb 2012 12:40:52 +0000 (+0100)
Subject: popt: Check for popt manually as well, not just using pkg-config.
X-Git-Tag: samba-4.0.0alpha18~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3992182fec4d46d4340fe038b7d3386b78701857;p=thirdparty%2Fsamba.git

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@samba.org>
Autobuild-Date: Mon Feb 20 15:13:32 CET 2012 on sn-devel-104
---

diff --git a/lib/popt/wscript b/lib/popt/wscript
index 6aa8e703397..7fd15ed53a2 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):