From 221a79ad008f839dae892e4b7f1a396c50442ecb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 25 Jul 2011 22:32:12 +0200
Subject: policy: Rename to samba-policy to avoid name space clashes.

---
 source4/lib/policy/policy.pc.in       | 12 ------------
 source4/lib/policy/samba-policy.pc.in | 12 ++++++++++++
 source4/lib/policy/wscript_build      |  6 +++---
 source4/samba_tool/wscript_build      |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 source4/lib/policy/policy.pc.in
 create mode 100644 source4/lib/policy/samba-policy.pc.in

diff --git a/source4/lib/policy/policy.pc.in b/source4/lib/policy/policy.pc.in
deleted file mode 100644
index fe5c66d987..0000000000
--- a/source4/lib/policy/policy.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: policy
-Description: Active Directory Group Policy library
-Requires: talloc
-Requires.private: ldb
-Version: @PACKAGE_VERSION@
-Libs: @LIB_RPATH@ -L${libdir} -lpolicy
-Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/lib/policy/samba-policy.pc.in b/source4/lib/policy/samba-policy.pc.in
new file mode 100644
index 0000000000..3247ae3364
--- /dev/null
+++ b/source4/lib/policy/samba-policy.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: samba-policy
+Description: Active Directory Group Policy library
+Requires: talloc
+Requires.private: ldb
+Version: @PACKAGE_VERSION@
+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
 	)
-- 
cgit