summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-07 17:35:20 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:44 +1000
commit82f3ef486f6566246d26156ac59c662aefee4c88 (patch)
treea7a69095b001e27e7ff72ab584852e8e886ece67
parentada6e570d11636ea79cc0503c3b7ee12fb07daa6 (diff)
downloadsamba-82f3ef486f6566246d26156ac59c662aefee4c88.tar.gz
samba-82f3ef486f6566246d26156ac59c662aefee4c88.tar.bz2
samba-82f3ef486f6566246d26156ac59c662aefee4c88.zip
build: zlib checks
-rw-r--r--lib/zlib/wscript11
-rw-r--r--source4/wscript1
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/zlib/wscript b/lib/zlib/wscript
new file mode 100644
index 0000000000..705fe90d9c
--- /dev/null
+++ b/lib/zlib/wscript
@@ -0,0 +1,11 @@
+def configure(conf):
+ conf.CHECK_HEADERS('zlib.h')
+ conf.CHECK_FUNCS_IN('zlibVersion', 'z')
+
+ conf.CHECK_CODE('''
+ #if (ZLIB_VERNUM >= 0x1230)
+ #else
+ #error "ZLIB_VERNUM < 0x1230"
+ #endif
+ ''',
+ define='HAVE_ZLIB')
diff --git a/source4/wscript b/source4/wscript
index d04313155b..bb1ae41b66 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -27,6 +27,7 @@ def configure(conf):
conf.sub_config('lib/tls')
conf.sub_config('ntvfs/sysdep')
conf.sub_config('../lib/util')
+ conf.sub_config('../lib/zlib')
conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #lib/socket_wrapper #lib/talloc #lib/replace #lib/event')