summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-07-25 22:32:12 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-07-26 13:31:09 +0200
commit221a79ad008f839dae892e4b7f1a396c50442ecb (patch)
treebd68547a75393d93f56bfe730fdce76a84420739 /source4
parent47a41c8daf4df59f4d80723c38749209c044d1a4 (diff)
downloadsamba-221a79ad008f839dae892e4b7f1a396c50442ecb.tar.gz
samba-221a79ad008f839dae892e4b7f1a396c50442ecb.tar.bz2
samba-221a79ad008f839dae892e4b7f1a396c50442ecb.zip
policy: Rename to samba-policy to avoid name space clashes.
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/policy/samba-policy.pc.in (renamed from source4/lib/policy/policy.pc.in)4
-rw-r--r--source4/lib/policy/wscript_build6
-rw-r--r--source4/samba_tool/wscript_build2
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/policy/policy.pc.in b/source4/lib/policy/samba-policy.pc.in
index fe5c66d987..3247ae3364 100644
--- a/source4/lib/policy/policy.pc.in
+++ b/source4/lib/policy/samba-policy.pc.in
@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: policy
+Name: samba-policy
Description: Active Directory Group Policy library
Requires: talloc
Requires.private: ldb
Version: @PACKAGE_VERSION@
-Libs: @LIB_RPATH@ -L${libdir} -lpolicy
+Libs: @LIB_RPATH@ -L${libdir} -lsamba-policy
Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
index 646b6ccb5d..3896357a53 100644
--- a/source4/lib/policy/wscript_build
+++ b/source4/lib/policy/wscript_build
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('policy',
+bld.SAMBA_LIBRARY('samba-policy',
source='gp_ldap.c gp_filesys.c gp_manage.c gp_ini.c',
- pc_files='policy.pc',
+ pc_files='samba-policy.pc',
public_deps='ldb samba-net',
vnum='0.0.1',
pyembed=True
@@ -10,6 +10,6 @@ bld.SAMBA_LIBRARY('policy',
bld.SAMBA_PYTHON('py_policy',
source='pypolicy.c',
- public_deps='policy pytalloc-util',
+ public_deps='samba-policy pytalloc-util',
realname='samba/policy.so'
)
diff --git a/source4/samba_tool/wscript_build b/source4/samba_tool/wscript_build
index 88b55eb996..75ff71f5e4 100644
--- a/source4/samba_tool/wscript_build
+++ b/source4/samba_tool/wscript_build
@@ -3,6 +3,6 @@
bld.SAMBA_BINARY('samba-tool',
source='samba_tool.c password.c vampire.c gpo.c',
autoproto='proto.h',
- deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS policy auth4',
+ deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS samba-policy auth4',
pyembed=True
)