Install pkg-config data files

Add seven data files for pkg-config, corresponding to the five modules
supported by krb5-config.  For krb5 and krb5-gssapi, we also provide
mit- versions for callers desiring to distinguish between our
implementation and Heimdal's.

Based on a patch from Stef Walter <stefw@gnome.org>.

ticket: 7529 (new)

diff --git a/.gitignore b/.gitignore
index f8c7c9d1afa9f351c72f6485920dbb1d537a1a11..bbc8440c7c2c8cac9f4e1d2bf6db4581a4089823 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.a
 *.dylib
 *.o
+*.pc
 *.pyc
 *.so
 binutils.versions

diff --git a/src/Makefile.in b/src/Makefile.in
index da2cfe5577ba4c9cb51a5581a838506c0bf0db2b..0d07b718ed27b2df9660a7c1a21feca0424eca65 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -60,7 +60,8 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROOT) $(KRB5OTHERMKDIRS) \
                $(KRB5_AD_MODULE_DIR) \
                $(KRB5_LIBKRB5_MODULE_DIR) \
                @localstatedir@ @localstatedir@/krb5kdc \
-               $(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR)
+               $(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR) \
+               $(PKGCONFIG_DIR)
 
 install-strip:
        $(MAKE) install INSTALL_STRIP=-s

diff --git a/src/build-tools/Makefile.in b/src/build-tools/Makefile.in
index fa5690006f0ecc7a93beb7186c8820a015ba3391..885c9921722e1d3bd2e5572973adddf7a12e520e 100644 (file)
--- a/src/build-tools/Makefile.in
+++ b/src/build-tools/Makefile.in
@@ -1,13 +1,41 @@
 mydir=build-tools
 BUILDTOP=$(REL)..
 
-all-unix:: krb5-config
+PKGCONFIG_FILES = \
+       kadm-client.pc \
+       kadm-server.pc \
+       kdb.pc \
+       mit-krb5.pc \
+       krb5.pc \
+       mit-krb5-gssapi.pc \
+       krb5-gssapi.pc
 
-krb5-config: $(srcdir)/krb5-config.in $(BUILDTOP)/config.status
+all-unix:: krb5-config $(PKGCONFIG_FILES)
+
+krb5-config $(PKGCONFIG_FILES): $(BUILDTOP)/config.status
        cd $(BUILDTOP) && $(SHELL) config.status $(mydir)/$@
+krb5-config: $(srcdir)/krb5-config.in
+kadm-client.pc: $(srcdir)/kadm-client.pc.in
+kadm-server.pc: $(srcdir)/kadm-server.pc.in
+kdb.pc: $(srcdir)/kdb.pc.in
+mit-krb5.pc: $(srcdir)/mit-krb5.pc.in
+krb5.pc: $(srcdir)/krb5.pc.in
+mit-krb5-gssapi.pc: $(srcdir)/mit-krb5-gssapi.pc.in
+krb5-gssapi.pc: $(srcdir)/krb5-gssapi.pc.in
 
 install-unix::
        $(INSTALL_SCRIPT) krb5-config $(DESTDIR)$(CLIENT_BINDIR)/krb5-config
+       $(INSTALL_DATA) kadm-client.pc \
+               $(DESTDIR)$(PKGCONFIG_DIR)/kadm-client.pc
+       $(INSTALL_DATA) kadm-server.pc \
+               $(DESTDIR)$(PKGCONFIG_DIR)/kadm-server.pc
+       $(INSTALL_DATA) kdb.pc $(DESTDIR)$(PKGCONFIG_DIR)/kdb.pc
+       $(INSTALL_DATA) mit-krb5.pc $(DESTDIR)$(PKGCONFIG_DIR)/mit-krb5.pc
+       $(INSTALL_DATA) krb5.pc $(DESTDIR)$(PKGCONFIG_DIR)/krb5.pc
+       $(INSTALL_DATA) mit-krb5-gssapi.pc \
+               $(DESTDIR)$(PKGCONFIG_DIR)/mit-krb5-gssapi.pc
+       $(INSTALL_DATA) krb5-gssapi.pc \
+               $(DESTDIR)$(PKGCONFIG_DIR)/krb5-gssapi.pc
 
 # Test to ensure that krb5-config does not spit out things like
 # $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf

diff --git a/src/build-tools/kadm-client.pc.in b/src/build-tools/kadm-client.pc.in
new file mode 100644 (file)
index 0000000..4562b8f
--- /dev/null
+++ b/src/build-tools/kadm-client.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: kadm-client
+Description: Kerberos administration client library
+Version: @KRB5_VERSION@
+Requires.private: mit-krb5-gssapi
+Cflags: -I${includedir}
+Libs: -L${libdir} -lkadm5clnt_mit
+Libs.private: -lgssrpc

diff --git a/src/build-tools/kadm-server.pc.in b/src/build-tools/kadm-server.pc.in
new file mode 100644 (file)
index 0000000..cd2f86c
--- /dev/null
+++ b/src/build-tools/kadm-server.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: kadm-server
+Description: Kerberos administration server library
+Version: @KRB5_VERSION@
+Requires.private: kdb mit-krb5-gssapi
+Cflags: -I${includedir}
+Libs: -L${libdir} -lkadm5srv_mit

diff --git a/src/build-tools/kdb.pc.in b/src/build-tools/kdb.pc.in
new file mode 100644 (file)
index 0000000..29506b8
--- /dev/null
+++ b/src/build-tools/kdb.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+KDB5_DB_LIB=@KDB5_DB_LIB@
+
+Name: kdb
+Description: Kerberos database access libraries
+Version: @KRB5_VERSION@
+Requires.private: mit-krb5-gssapi mit-krb5
+Cflags: -I${includedir}
+Libs: -L${libdir} -lkdb5
+Libs.private: -lgssrpc ${KDB5_DB_LIB}

diff --git a/src/build-tools/krb5-gssapi.pc.in b/src/build-tools/krb5-gssapi.pc.in
new file mode 100644 (file)
index 0000000..4e2d832
--- /dev/null
+++ b/src/build-tools/krb5-gssapi.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=MIT
+
+Name: krb5-gssapi
+Description: Kerberos implementation of the GSSAPI
+Version: @KRB5_VERSION@
+Requires: mit-krb5-gssapi

diff --git a/src/build-tools/krb5.pc.in b/src/build-tools/krb5.pc.in
new file mode 100644 (file)
index 0000000..5f81049
--- /dev/null
+++ b/src/build-tools/krb5.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=MIT
+
+defccname=@DEFCCNAME@
+defktname=@DEFKTNAME@
+defcktname=@DEFCKTNAME@
+
+Name: krb5
+Description: An implementation of Kerberos network authentication
+Version: @KRB5_VERSION@
+Requires: mit-krb5

diff --git a/src/build-tools/mit-krb5-gssapi.pc.in b/src/build-tools/mit-krb5-gssapi.pc.in
new file mode 100644 (file)
index 0000000..7b91b19
--- /dev/null
+++ b/src/build-tools/mit-krb5-gssapi.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: mit-krb5-gssapi
+Description: Kerberos implementation of the GSSAPI
+Version: @KRB5_VERSION@
+Requires.private: mit-krb5
+Cflags: -I${includedir}
+Libs: -L${libdir} -lgssapi_krb5

diff --git a/src/build-tools/mit-krb5.pc.in b/src/build-tools/mit-krb5.pc.in
new file mode 100644 (file)
index 0000000..0308815
--- /dev/null
+++ b/src/build-tools/mit-krb5.pc.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+defccname=@DEFCCNAME@
+defktname=@DEFKTNAME@
+defcktname=@DEFCKTNAME@
+
+Name: mit-krb5
+Description: An implementation of Kerberos network authentication
+Version: @KRB5_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lkrb5 -lk5crypto -lcom_err
+Libs.private: -lkrb5support

diff --git a/src/config/pre.in b/src/config/pre.in
index 1ba26d8502a5341067f4968eff546984f926a9b3..e57019f98f5bc218dc673239023202de5f58ac7d 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -202,6 +202,7 @@ KRB5MANROOT = @mandir@
 ADMIN_BINDIR = @sbindir@
 SERVER_BINDIR = @sbindir@
 CLIENT_BINDIR =@bindir@
+PKGCONFIG_DIR = @libdir@/pkgconfig
 ADMIN_MANDIR = $(KRB5MANROOT)/man8
 SERVER_MANDIR = $(KRB5MANROOT)/man8
 CLIENT_MANDIR = $(KRB5MANROOT)/man1

diff --git a/src/configure.in b/src/configure.in
index 69863d21947980d09faefa13369df6f1d3bac561..c5c599b57bbbec2ff2e75bb8f6295d8f01b73de6 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1290,7 +1290,15 @@ AC_DEFINE_UNQUOTED(DEFKTNAME, ["$DEFKTNAME"], [Define to default keytab name])
 AC_DEFINE_UNQUOTED(DEFCKTNAME, ["$DEFCKTNAME"],
                    [Define to default client keytab name])
 
-AC_CONFIG_FILES(build-tools/krb5-config, [chmod +x build-tools/krb5-config])
+AC_CONFIG_FILES([build-tools/krb5-config], [chmod +x build-tools/krb5-config])
+AC_CONFIG_FILES([build-tools/kadm-server.pc
+       build-tools/kadm-client.pc
+       build-tools/kdb.pc
+       build-tools/krb5.pc
+       build-tools/krb5-gssapi.pc
+       build-tools/mit-krb5.pc
+       build-tools/mit-krb5-gssapi.pc
+])
 V5_AC_OUTPUT_MAKEFILE(.
 
        util util/support util/profile util/profile/testmod util/send-pr