From b0b94a445a4283843772c3a4d525e10ba2a98924 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Thu, 27 Sep 2012 13:51:27 +0200
Subject: [PATCH] Add pkg-config files for krb5 libraries

 * These can be used along side krb5-config

Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
---
 cf/Makefile.am.common      |  2 +-
 tools/Makefile.am          | 12 +++++++++---
 tools/heimdal-gssapi.pc.in |  5 ++---
 tools/kadm-client.pc.in    | 10 ++++++++++
 tools/kadm-server.pc.in    | 10 ++++++++++
 tools/kafs.pc.in           | 10 ++++++++++
 tools/krb5-gssapi.pc.in    | 10 ++++++++++
 tools/krb5.pc.in           | 11 +++++++++++
 8 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 tools/kadm-client.pc.in
 create mode 100644 tools/kadm-server.pc.in
 create mode 100644 tools/kafs.pc.in
 create mode 100644 tools/krb5-gssapi.pc.in
 create mode 100644 tools/krb5.pc.in

diff --git a/cf/Makefile.am.common b/cf/Makefile.am.common
index f69b86f8e..986206004 100644
--- a/cf/Makefile.am.common
+++ b/cf/Makefile.am.common
@@ -1,6 +1,6 @@
 # $Id$
 
-SUFFIXES = .et .h
+SUFFIXES = .et .h .pc.in .pc
 
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 36eed71d7..e872b3fe7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,13 @@ bin_SCRIPTS = krb5-config
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-pkgconfig_DATA = heimdal-gssapi.pc
+pkgconfig_DATA = \
+	heimdal-gssapi.pc \
+	kafs.pc \
+	kadm-client.pc \
+	kadm-server.pc \
+	krb5.pc \
+	krb5-gssapi.pc
 
 man_MANS = krb5-config.1
 
@@ -35,8 +41,8 @@ krb5-config: krb5-config.in
 	mv $@.new $@
 	chmod +x $@
 
-heimdal-gssapi.pc: heimdal-gssapi.pc.in
-	$(subst) $(srcdir)/heimdal-gssapi.pc.in > $@.new
+.pc.in.pc:
+	$(subst) $< > $@.new
 	mv $@.new $@
 
 EXTRA_DIST = \
diff --git a/tools/heimdal-gssapi.pc.in b/tools/heimdal-gssapi.pc.in
index 1d8f23553..e05300387 100644
--- a/tools/heimdal-gssapi.pc.in
+++ b/tools/heimdal-gssapi.pc.in
@@ -8,7 +8,6 @@ Name: @PACKAGE@
 Description: Heimdal is an implementation of Kerberos 5, freely available under a three clause BSD style license.
 Version: @VERSION@
 URL: http://www.pdc.kth.se/heimdal/
-#Requires: foo = 1.3.1
-#Conflicts: bar <= 4.5
-Libs: -L${libdir} -lgssapi -lheimntlm -lkrb5 @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lroken @LIB_crypt@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
+Requires: krb5
+Libs: -L${libdir} -lgssapi -lheimntlm @LIB_crypt@
 Cflags: -I${includedir}
diff --git a/tools/kadm-client.pc.in b/tools/kadm-client.pc.in
new file mode 100644
index 000000000..719794195
--- /dev/null
+++ b/tools/kadm-client.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: kadm-client
+Description: Kadmin client library.
+Version: @VERSION@
+Requires: krb5-gssapi
+Libs: -lkadm5clnt
diff --git a/tools/kadm-server.pc.in b/tools/kadm-server.pc.in
new file mode 100644
index 000000000..d134ca798
--- /dev/null
+++ b/tools/kadm-server.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: kadm-server
+Description: Kadmin server library.
+Version: @VERSION@
+Requires: krb5-gssapi
+Libs: -lkadm5srv @LIB_dbopen@
diff --git a/tools/kafs.pc.in b/tools/kafs.pc.in
new file mode 100644
index 000000000..e45fabc39
--- /dev/null
+++ b/tools/kafs.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: kafs
+Description: Libraries for application that uses kafs.
+Version: @VERSION@
+Requires: krb5
+Libs: -lkafs
diff --git a/tools/krb5-gssapi.pc.in b/tools/krb5-gssapi.pc.in
new file mode 100644
index 000000000..482b78f03
--- /dev/null
+++ b/tools/krb5-gssapi.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=Heimdal
+
+Name: krb5-gssapi
+Description: Kerberos implementation of the GSS API.
+Version: @VERSION@
+Requires: heimdal-gssapi
diff --git a/tools/krb5.pc.in b/tools/krb5.pc.in
new file mode 100644
index 000000000..4e6c27788
--- /dev/null
+++ b/tools/krb5.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=Heimdal
+
+Name: krb5
+Description: Heimdal implementation of the kerberos network authentication.
+Version: @VERSION@
+Libs: -L${libdir} -lkrb5 @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
+Cflags: -I${includedir}