From 6076a828d4b27ffce1ae292cbad4f12b3138ddd7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 24 Nov 2013 14:56:38 +0000
Subject: [PATCH] Add heimdal-kadm-{client,server} with kadm-{client,server}
 depending on them.

---
 tools/Makefile.am                                      | 2 ++
 tools/{kadm-client.pc.in => heimdal-kadm-client.pc.in} | 7 ++++---
 tools/{kadm-server.pc.in => heimdal-kadm-server.pc.in} | 7 ++++---
 tools/kadm-client.pc.in                                | 4 ++--
 tools/kadm-server.pc.in                                | 4 ++--
 tools/kafs.pc.in                                       | 2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)
 copy tools/{kadm-client.pc.in => heimdal-kadm-client.pc.in} (56%)
 copy tools/{kadm-server.pc.in => heimdal-kadm-server.pc.in} (54%)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5dee43b39..e86146747 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -9,6 +9,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
 	heimdal-gssapi.pc \
 	heimdal-krb5.pc \
+	heimdal-kadm-client.pc \
+	heimdal-kadm-server.pc \
 	kafs.pc \
 	kadm-client.pc \
 	kadm-server.pc \
diff --git a/tools/kadm-client.pc.in b/tools/heimdal-kadm-client.pc.in
similarity index 56%
copy from tools/kadm-client.pc.in
copy to tools/heimdal-kadm-client.pc.in
index 719794195..b4aea69d4 100644
--- a/tools/kadm-client.pc.in
+++ b/tools/heimdal-kadm-client.pc.in
@@ -3,8 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: kadm-client
+Name: heimdal-kadm-client
 Description: Kadmin client library.
 Version: @VERSION@
-Requires: krb5-gssapi
-Libs: -lkadm5clnt
+Requires: heimdal-gssapi
+Libs: -L${libdir} -lkadm5clnt
+Cflags: -I${includedir}
diff --git a/tools/kadm-server.pc.in b/tools/heimdal-kadm-server.pc.in
similarity index 54%
copy from tools/kadm-server.pc.in
copy to tools/heimdal-kadm-server.pc.in
index d134ca798..575755f86 100644
--- a/tools/kadm-server.pc.in
+++ b/tools/heimdal-kadm-server.pc.in
@@ -3,8 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: kadm-server
+Name: heimdal-kadm-server
 Description: Kadmin server library.
 Version: @VERSION@
-Requires: krb5-gssapi
-Libs: -lkadm5srv @LIB_dbopen@
+Requires: heimdal-gssapi
+Libs: -L${libdir} -lkadm5srv @LIB_dbopen@
+Cflags: -I${includedir}
diff --git a/tools/kadm-client.pc.in b/tools/kadm-client.pc.in
index 719794195..63e1e174b 100644
--- a/tools/kadm-client.pc.in
+++ b/tools/kadm-client.pc.in
@@ -2,9 +2,9 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+vendor=Heimdal
 
 Name: kadm-client
 Description: Kadmin client library.
 Version: @VERSION@
-Requires: krb5-gssapi
-Libs: -lkadm5clnt
+Depends: heimdal-kadm-client
diff --git a/tools/kadm-server.pc.in b/tools/kadm-server.pc.in
index d134ca798..94d0fd055 100644
--- a/tools/kadm-server.pc.in
+++ b/tools/kadm-server.pc.in
@@ -2,9 +2,9 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+vendor=Heimdal
 
 Name: kadm-server
 Description: Kadmin server library.
 Version: @VERSION@
-Requires: krb5-gssapi
-Libs: -lkadm5srv @LIB_dbopen@
+Depends: heimdal-kadm-server
diff --git a/tools/kafs.pc.in b/tools/kafs.pc.in
index e45fabc39..77d4a6250 100644
--- a/tools/kafs.pc.in
+++ b/tools/kafs.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: kafs
 Description: Libraries for application that uses kafs.
 Version: @VERSION@
-Requires: krb5
+Requires: heimdal-krb5
 Libs: -lkafs
-- 
2.11.4.GIT