policy: Rename to samba-policy to avoid name space clashes.

diff --git a/source4/lib/policy/policy.pc.in b/source4/lib/policy/samba-policy.pc.in
similarity index 79%
rename from source4/lib/policy/policy.pc.in
rename to source4/lib/policy/samba-policy.pc.in
index fe5c66d9871f57e601d07bed9b9d241d4795630e..3247ae336473b4f884cb1df3ed3a06a166138081 100644 (file)
--- 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 646b6ccb5d3569a448f636cb5a6b4d79505618fb..3896357a53b0799acb856c21f74a8ad01d1ae2d5 100644 (file)
--- 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 88b55eb996c2675bc11c5d84d298e1d262d4ea91..75ff71f5e4b269d791a1a82cee563d4c710ecccc 100644 (file)
--- 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
        )