summaryrefslogtreecommitdiff
path: root/lib/util/wscript_build
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-20 14:26:36 -0700
committerAndrew Bartlett <abartlet@samba.org>2011-09-23 09:24:03 +0200
commitd40fe50a6755ab701f2fe8a434f1d3331769a4c0 (patch)
tree52a3d1e3129646303f17e661a29d7ad7db4e2be7 /lib/util/wscript_build
parent4383665101db5c2ddb37d5c90ee9304e468b0310 (diff)
downloadsamba-d40fe50a6755ab701f2fe8a434f1d3331769a4c0.tar.gz
samba-d40fe50a6755ab701f2fe8a434f1d3331769a4c0.tar.bz2
samba-d40fe50a6755ab701f2fe8a434f1d3331769a4c0.zip
build: avoid util.h as a public header name due to conflict with MacOS
Diffstat (limited to 'lib/util/wscript_build')
-rwxr-xr-xlib/util/wscript_build4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 553748a22e..70a639d2d7 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -10,8 +10,8 @@ bld.SAMBA_LIBRARY('samba-util',
server_id.c dprintf.c parmlist.c bitmap.c''',
deps='DYNCONFIG',
public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset',
- public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h',
- header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
+ public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
+ header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
local_include=False,
vnum='0.0.1',
pc_files='samba-util.pc'