summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2012-05-09 15:33:04 +0200
committerGünther Deschner <gd@samba.org>2012-05-09 17:38:33 +0200
commit5f05eacd27f0dc512748c14cac5f4d6afb327f99 (patch)
treea7bbeebddd62a6b57637fe4dc963575a31c23346 /lib
parent67adda0d69558c0bd2236478c8c4d2c76417dc4b (diff)
downloadsamba-5f05eacd27f0dc512748c14cac5f4d6afb327f99.tar.gz
samba-5f05eacd27f0dc512748c14cac5f4d6afb327f99.tar.bz2
samba-5f05eacd27f0dc512748c14cac5f4d6afb327f99.zip
allow to use system iniparser library.
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Wed May 9 17:38:33 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib')
-rw-r--r--lib/iniparser/src/wscript21
-rw-r--r--lib/iniparser/src/wscript_build7
2 files changed, 21 insertions, 7 deletions
diff --git a/lib/iniparser/src/wscript b/lib/iniparser/src/wscript
new file mode 100644
index 0000000000..c66f298048
--- /dev/null
+++ b/lib/iniparser/src/wscript
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import Options
+
+def configure(conf):
+ conf.CHECK_HEADERS('float.h')
+
+ if conf.CHECK_BUNDLED_SYSTEM('iniparser', checkfunctions='iniparser_load', headers='iniparser.h'):
+ conf.define('USING_SYSTEM_INIPARSER', 1)
+
+def build(bld):
+ if bld.CONFIG_SET('USING_SYSTEM_INIPARSER'):
+ return
+
+ bld.SAMBA_LIBRARY('iniparser',
+ source='''../../iniparser_build/iniparser.c
+ ../../iniparser_build/dictionary.c
+ ../../iniparser_build/strlib.c''',
+ cflags='',
+ deps='replace',
+ private_library=True)
diff --git a/lib/iniparser/src/wscript_build b/lib/iniparser/src/wscript_build
deleted file mode 100644
index aa15c9f66e..0000000000
--- a/lib/iniparser/src/wscript_build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_SUBSYSTEM('LIBINIPARSER',
- source='../../iniparser_build/iniparser.c ../../iniparser_build/dictionary.c ../../iniparser_build/strlib.c',
- deps='replace',
- cflags=''
- )