aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2018-04-04 04:21:19 +0000
committerHiroki Sato <hrs@FreeBSD.org>2018-04-04 04:21:19 +0000
commitd684f11da759490a8d98d7b790796106285f4084 (patch)
tree27b7356df710fdf1440fe2c23154b8121e99f2ab /tools
parentf52d4664e3f68828c06f85bfc1afa271e3e04713 (diff)
Import Heimdal 7.5.0.vendor/heimdal/7.5.0
Notes
Notes: svn path=/vendor-crypto/heimdal/dist/; revision=331978 svn path=/vendor-crypto/heimdal/7.5.0/; revision=331979; tag=vendor/heimdal/7.5.0
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am27
-rw-r--r--tools/Makefile.in341
-rwxr-xr-xtools/cov.sh19
-rw-r--r--tools/heimdal-gssapi.pc.in10
-rw-r--r--tools/heimdal-kadm-client.pc.in11
-rw-r--r--tools/heimdal-kadm-server.pc.in12
-rw-r--r--tools/heimdal-krb5.pc.in12
-rw-r--r--tools/kadm-client.pc.in10
-rw-r--r--tools/kadm-server.pc.in10
-rw-r--r--tools/kafs.pc.in10
-rw-r--r--tools/krb5-config.14
-rw-r--r--tools/krb5-config.cat14
-rwxr-xr-xtools/krb5-config.in164
-rw-r--r--tools/krb5-gssapi.pc.in10
-rw-r--r--tools/krb5.pc.in10
15 files changed, 508 insertions, 146 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 36eed71d77ab..7c50e464058d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,16 @@ bin_SCRIPTS = krb5-config
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = heimdal-gssapi.pc
+pkgconfig_DATA = \
+ heimdal-gssapi.pc \
+ heimdal-krb5.pc \
+ heimdal-kadm-client.pc \
+ heimdal-kadm-server.pc \
+ kafs.pc \
+ kadm-client.pc \
+ kadm-server.pc \
+ krb5.pc \
+ krb5-gssapi.pc
man_MANS = krb5-config.1
@@ -16,6 +25,7 @@ endif
subst = sed -e "s!@PACKAGE\@!$(PACKAGE)!g" \
-e "s!@VERSION\@!$(VERSION)!g" \
+ -e "s!@CANONICAL_HOST\@!$(CANONICAL_HOST)!g" \
-e "s!@prefix\@!$(prefix)!g" \
-e "s!@exec_prefix\@!$(exec_prefix)!g" \
-e "s!@libdir\@!$(libdir)!g" \
@@ -23,7 +33,6 @@ subst = sed -e "s!@PACKAGE\@!$(PACKAGE)!g" \
-e "s!@PTHREAD_LIBADD\@!$(PTHREAD_LIBADD)!g" \
-e "s!@LIB_crypt\@!$(LIB_crypt)!g" \
-e "s!@LIB_dbopen\@!$(LIB_dbopen)!g" \
- -e "s!@INCLUDE_hcrypto\@!$(INCLUDE_hcrypto)!g" \
-e "s!@LIB_hcrypto_appl\@!$(LIB_hcrypto_appl)!g" \
-e "s!@LIB_dlopen\@!$(LIB_dlopen)!g" \
-e "s!@LIB_door_create\@!$(LIB_door_create)!g" \
@@ -31,24 +40,26 @@ subst = sed -e "s!@PACKAGE\@!$(PACKAGE)!g" \
-e "s!@LIBS\@!$(LIBS)!g"
krb5-config: krb5-config.in
- $(subst) $(srcdir)/krb5-config.in > $@.new
+ $(subst) $(srcdir)/krb5-config.in | /bin/sh > $@.new
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 = \
NTMakefile \
+ cov.sh \
$(man_MANS) \
krb5-config.in \
heimdal-gssapi.pc.in \
- kdc-log-analyze.pl
+ kdc-log-analyze.pl \
+ $(pkgconfig_DATA:.pc=.pc.in)
CLEANFILES = \
krb5-config \
krb5-config.new \
- heimdal-gssapi.pc \
- heimdal-gssapi.pc.new
+ $(pkgconfig_DATA) \
+ $(pkgconfig_DATA:.pc=.pc.new)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index d66e04eda9dc..7053a36277e0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -23,6 +22,61 @@
VPATH = @srcdir@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -41,9 +95,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.am.common \
- $(top_srcdir)/cf/Makefile.am.common
subdir = tools
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
@@ -59,8 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
$(top_srcdir)/cf/check-man.m4 \
$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
$(top_srcdir)/cf/check-type-extra.m4 \
- $(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
- $(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+ $(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/crypto.m4 \
$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
$(top_srcdir)/cf/dispatch.m4 $(top_srcdir)/cf/dlopen.m4 \
$(top_srcdir)/cf/find-func-no-libs.m4 \
@@ -73,6 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
$(top_srcdir)/cf/krb-bigendian.m4 \
$(top_srcdir)/cf/krb-func-getlogin.m4 \
$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+ $(top_srcdir)/cf/krb-prog-perl.m4 \
$(top_srcdir)/cf/krb-readline.m4 \
$(top_srcdir)/cf/krb-struct-spwd.m4 \
$(top_srcdir)/cf/krb-struct-winsize.m4 \
@@ -92,6 +143,7 @@ am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/config.h
CONFIG_CLEAN_FILES =
@@ -117,19 +169,48 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(pkgconfigdir)"
SCRIPTS = $(bin_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
man1dir = $(mandir)/man1
MANS = $(man_MANS)
DATA = $(pkgconfig_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.am.common \
+ $(top_srcdir)/cf/Makefile.am.common
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AIX_EXTRA_KAFS = @AIX_EXTRA_KAFS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
+AS = @AS@
ASN1_COMPILE = @ASN1_COMPILE@
ASN1_COMPILE_DEP = @ASN1_COMPILE_DEP@
AUTOCONF = @AUTOCONF@
@@ -148,12 +229,12 @@ COMPILE_ET = @COMPILE_ET@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
+DB1LIB = @DB1LIB@
+DB3LIB = @DB3LIB@
DBHEADER = @DBHEADER@
-DBLIB = @DBLIB@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DIR_com_err = @DIR_com_err@
-DIR_hcrypto = @DIR_hcrypto@
DIR_hdbdir = @DIR_hdbdir@
DIR_roken = @DIR_roken@
DLLTOOL = @DLLTOOL@
@@ -163,17 +244,17 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCD_MIG = @GCD_MIG@
GREP = @GREP@
GROFF = @GROFF@
INCLUDES_roken = @INCLUDES_roken@
-INCLUDE_hcrypto = @INCLUDE_hcrypto@
-INCLUDE_hesiod = @INCLUDE_hesiod@
-INCLUDE_krb4 = @INCLUDE_krb4@
INCLUDE_libedit = @INCLUDE_libedit@
INCLUDE_libintl = @INCLUDE_libintl@
INCLUDE_openldap = @INCLUDE_openldap@
+INCLUDE_openssl_crypto = @INCLUDE_openssl_crypto@
INCLUDE_readline = @INCLUDE_readline@
INCLUDE_sqlite3 = @INCLUDE_sqlite3@
INSTALL = @INSTALL@
@@ -192,12 +273,9 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
-LIB_NDBM = @LIB_NDBM@
-LIB_XauFileName = @LIB_XauFileName@
-LIB_XauReadAuth = @LIB_XauReadAuth@
-LIB_XauWriteAuth = @LIB_XauWriteAuth@
LIB_bswap16 = @LIB_bswap16@
LIB_bswap32 = @LIB_bswap32@
+LIB_bswap64 = @LIB_bswap64@
LIB_com_err = @LIB_com_err@
LIB_com_err_a = @LIB_com_err_a@
LIB_com_err_so = @LIB_com_err_so@
@@ -206,6 +284,7 @@ LIB_db_create = @LIB_db_create@
LIB_dbm_firstkey = @LIB_dbm_firstkey@
LIB_dbopen = @LIB_dbopen@
LIB_dispatch_async_f = @LIB_dispatch_async_f@
+LIB_dladdr = @LIB_dladdr@
LIB_dlopen = @LIB_dlopen@
LIB_dn_expand = @LIB_dn_expand@
LIB_dns_search = @LIB_dns_search@
@@ -222,10 +301,8 @@ LIB_hcrypto = @LIB_hcrypto@
LIB_hcrypto_a = @LIB_hcrypto_a@
LIB_hcrypto_appl = @LIB_hcrypto_appl@
LIB_hcrypto_so = @LIB_hcrypto_so@
-LIB_hesiod = @LIB_hesiod@
LIB_hstrerror = @LIB_hstrerror@
LIB_kdb = @LIB_kdb@
-LIB_krb4 = @LIB_krb4@
LIB_libedit = @LIB_libedit@
LIB_libintl = @LIB_libintl@
LIB_loadquery = @LIB_loadquery@
@@ -233,6 +310,7 @@ LIB_logout = @LIB_logout@
LIB_logwtmp = @LIB_logwtmp@
LIB_openldap = @LIB_openldap@
LIB_openpty = @LIB_openpty@
+LIB_openssl_crypto = @LIB_openssl_crypto@
LIB_otp = @LIB_otp@
LIB_pidfile = @LIB_pidfile@
LIB_readline = @LIB_readline@
@@ -247,12 +325,15 @@ LIB_sqlite3 = @LIB_sqlite3@
LIB_syslog = @LIB_syslog@
LIB_tgetent = @LIB_tgetent@
LIPO = @LIPO@
+LMDBLIB = @LMDBLIB@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
+NDBMLIB = @NDBMLIB@
NM = @NM@
NMEDIT = @NMEDIT@
NO_AFS = @NO_AFS@
@@ -269,6 +350,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LDADD = @PTHREAD_LDADD@
@@ -283,13 +365,7 @@ STRIP = @STRIP@
VERSION = @VERSION@
VERSIONING = @VERSIONING@
WFLAGS = @WFLAGS@
-WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
-WFLAGS_NOUNUSED = @WFLAGS_NOUNUSED@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
+WFLAGS_LITE = @WFLAGS_LITE@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
@@ -313,6 +389,8 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+db_type = @db_type@
+db_type_preference = @db_type_preference@
docdir = @docdir@
dpagaix_cflags = @dpagaix_cflags@
dpagaix_ldadd = @dpagaix_ldadd@
@@ -348,36 +426,55 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUFFIXES = .et .h .x .z .hx .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
+SUFFIXES = .et .h .pc.in .pc .x .z .hx .1 .3 .5 .7 .8 .cat1 .cat3 \
+ .cat5 .cat7 .cat8
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
AM_CPPFLAGS = $(INCLUDES_roken)
@do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
AM_CFLAGS = $(WFLAGS)
CP = cp
buildinclude = $(top_builddir)/include
+LIB_XauReadAuth = @LIB_XauReadAuth@
LIB_el_init = @LIB_el_init@
LIB_getattr = @LIB_getattr@
LIB_getpwent_r = @LIB_getpwent_r@
LIB_odm_initialize = @LIB_odm_initialize@
LIB_setpcred = @LIB_setpcred@
-HESIODLIB = @HESIODLIB@
-HESIODINCLUDE = @HESIODINCLUDE@
+INCLUDE_krb4 = @INCLUDE_krb4@
+LIB_krb4 = @LIB_krb4@
libexec_heimdaldir = $(libexecdir)/heimdal
NROFF_MAN = groff -mandoc -Tascii
-LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+@NO_AFS_FALSE@LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+@NO_AFS_TRUE@LIB_kafs =
@KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
@KRB5_TRUE@ $(top_builddir)/lib/asn1/libasn1.la
@KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
-LIB_heimbase = $(top_builddir)/base/libheimbase.la
+LIB_heimbase = $(top_builddir)/lib/base/libheimbase.la
@DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
+
+#silent-rules
+heim_verbose = $(heim_verbose_$(V))
+heim_verbose_ = $(heim_verbose_$(AM_DEFAULT_VERBOSITY))
+heim_verbose_0 = @echo " GEN "$@;
bin_SCRIPTS = krb5-config
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = heimdal-gssapi.pc
+pkgconfig_DATA = \
+ heimdal-gssapi.pc \
+ heimdal-krb5.pc \
+ heimdal-kadm-client.pc \
+ heimdal-kadm-server.pc \
+ kafs.pc \
+ kadm-client.pc \
+ kadm-server.pc \
+ krb5.pc \
+ krb5-gssapi.pc
+
man_MANS = krb5-config.1
@PKINIT_TRUE@LIB_pkinit = -lhx509
subst = sed -e "s!@PACKAGE\@!$(PACKAGE)!g" \
-e "s!@VERSION\@!$(VERSION)!g" \
+ -e "s!@CANONICAL_HOST\@!$(CANONICAL_HOST)!g" \
-e "s!@prefix\@!$(prefix)!g" \
-e "s!@exec_prefix\@!$(exec_prefix)!g" \
-e "s!@libdir\@!$(libdir)!g" \
@@ -385,7 +482,6 @@ subst = sed -e "s!@PACKAGE\@!$(PACKAGE)!g" \
-e "s!@PTHREAD_LIBADD\@!$(PTHREAD_LIBADD)!g" \
-e "s!@LIB_crypt\@!$(LIB_crypt)!g" \
-e "s!@LIB_dbopen\@!$(LIB_dbopen)!g" \
- -e "s!@INCLUDE_hcrypto\@!$(INCLUDE_hcrypto)!g" \
-e "s!@LIB_hcrypto_appl\@!$(LIB_hcrypto_appl)!g" \
-e "s!@LIB_dlopen\@!$(LIB_dlopen)!g" \
-e "s!@LIB_door_create\@!$(LIB_door_create)!g" \
@@ -394,21 +490,23 @@ subst = sed -e "s!@PACKAGE\@!$(PACKAGE)!g" \
EXTRA_DIST = \
NTMakefile \
+ cov.sh \
$(man_MANS) \
krb5-config.in \
heimdal-gssapi.pc.in \
- kdc-log-analyze.pl
+ kdc-log-analyze.pl \
+ $(pkgconfig_DATA:.pc=.pc.in)
CLEANFILES = \
krb5-config \
krb5-config.new \
- heimdal-gssapi.pc \
- heimdal-gssapi.pc.new
+ $(pkgconfig_DATA) \
+ $(pkgconfig_DATA:.pc=.pc.new)
all: all-am
.SUFFIXES:
-.SUFFIXES: .et .h .x .z .hx .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+.SUFFIXES: .et .h .pc.in .pc .x .z .hx .1 .3 .5 .7 .8 .cat1 .cat3 .cat5 .cat7 .cat8 .c
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -421,7 +519,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign tools/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -430,6 +527,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -441,8 +539,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -470,9 +571,7 @@ uninstall-binSCRIPTS:
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
mostlyclean-libtool:
-rm -f *.lo
@@ -481,11 +580,18 @@ clean-libtool:
-rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list=''; test -n "$(man1dir)" || exit 0; \
- { for i in $$list; do echo "$$i"; done; \
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
- sed -n '/\.1[a-z]*$$/p'; \
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -514,13 +620,14 @@ uninstall-man1:
sed -n '/\.1[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -z "$$files" || { \
- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -534,30 +641,15 @@ uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
- @list='$(MANS)'; if test -n "$$list"; then \
- list=`for p in $$list; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
- if test -n "$$list" && \
- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
- echo " typically \`make maintainer-clean' will remove them" >&2; \
- exit 1; \
- else :; fi; \
- else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -608,10 +700,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -651,9 +748,8 @@ install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-binSCRIPTS
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-exec-am: install-binSCRIPTS install-exec-local
+
install-html: install-html-am
install-html-am:
@@ -696,39 +792,53 @@ uninstall-am: uninstall-binSCRIPTS uninstall-man \
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1
-.MAKE: check-am install-am install-data-am install-exec-am \
- install-strip uninstall-am
+.MAKE: check-am install-am install-data-am install-strip uninstall-am
.PHONY: all all-am all-local check check-am check-local clean \
- clean-generic clean-libtool dist-hook distclean \
- distclean-generic distclean-libtool distdir dvi dvi-am html \
- html-am info info-am install install-am install-binSCRIPTS \
- install-data install-data-am install-data-hook install-dvi \
- install-dvi-am install-exec install-exec-am install-exec-hook \
- install-html install-html-am install-info install-info-am \
- install-man install-man1 install-pdf install-pdf-am \
- install-pkgconfigDATA install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ clean-generic clean-libtool cscopelist-am ctags-am dist-hook \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binSCRIPTS install-data install-data-am \
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-exec-local install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-pkgconfigDATA \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-binSCRIPTS uninstall-hook uninstall-man \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-binSCRIPTS uninstall-hook uninstall-man \
uninstall-man1 uninstall-pkgconfigDATA
+.PRECIOUS: Makefile
+
install-suid-programs:
@foo='$(bin_SUIDS)'; \
for file in $$foo; do \
- x=$(DESTDIR)$(bindir)/$$file; \
- if chown 0:0 $$x && chmod u+s $$x; then :; else \
- echo "*"; \
- echo "* Failed to install $$x setuid root"; \
- echo "*"; \
- fi; done
+ x=$(DESTDIR)$(bindir)/$$file; \
+ if chown 0:0 $$x && chmod u+s $$x; then :; else \
+ echo "*"; \
+ echo "* Failed to install $$x setuid root"; \
+ echo "*"; \
+ fi; \
+ done
+
+install-exec-local: install-suid-programs
-install-exec-hook: install-suid-programs
+codesign-all:
+ @if [ X"$$CODE_SIGN_IDENTITY" != X ] ; then \
+ foo='$(bin_PROGRAMS) $(sbin_PROGRAMS) $(libexec_PROGRAMS)' ; \
+ for file in $$foo ; do \
+ echo "CODESIGN $$file" ; \
+ codesign -f -s "$$CODE_SIGN_IDENTITY" $$file || exit 1 ; \
+ done ; \
+ fi
-install-build-headers:: $(include_HEADERS) $(dist_include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ) $(nobase_include_HEADERS)
- @foo='$(include_HEADERS) $(dist_include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ)'; \
+all-local: codesign-all
+
+install-build-headers:: $(include_HEADERS) $(dist_include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ) $(nobase_include_HEADERS) $(noinst_HEADERS)
+ @foo='$(include_HEADERS) $(dist_include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ) $(noinst_HEADERS)'; \
for f in $$foo; do \
f=`basename $$f`; \
if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
@@ -736,7 +846,7 @@ install-build-headers:: $(include_HEADERS) $(dist_include_HEADERS) $(nodist_incl
if cmp -s $$file $(buildinclude)/$$f 2> /dev/null ; then \
: ; else \
echo " $(CP) $$file $(buildinclude)/$$f"; \
- $(CP) $$file $(buildinclude)/$$f; \
+ $(CP) $$file $(buildinclude)/$$f || true; \
fi ; \
done ; \
foo='$(nobase_include_HEADERS)'; \
@@ -793,6 +903,8 @@ check-local::
$(NROFF_MAN) $< > $@
.5.cat5:
$(NROFF_MAN) $< > $@
+.7.cat7:
+ $(NROFF_MAN) $< > $@
.8.cat8:
$(NROFF_MAN) $< > $@
@@ -835,6 +947,19 @@ dist-cat5-mans:
$(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \
done
+dist-cat7-mans:
+ @foo='$(man7_MANS)'; \
+ bar='$(man_MANS)'; \
+ for i in $$bar; do \
+ case $$i in \
+ *.7) foo="$$foo $$i";; \
+ esac; done ;\
+ for i in $$foo; do \
+ x=`echo $$i | sed 's/\.[^.]*$$/.cat7/'`; \
+ echo "$(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x"; \
+ $(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \
+ done
+
dist-cat8-mans:
@foo='$(man8_MANS)'; \
bar='$(man_MANS)'; \
@@ -848,13 +973,13 @@ dist-cat8-mans:
$(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \
done
-dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans
+dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat7-mans dist-cat8-mans
install-cat-mans:
- $(SHELL) $(top_srcdir)/cf/install-catman.sh install "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
+ $(SHELL) $(top_srcdir)/cf/install-catman.sh install "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man7_MANS) $(man8_MANS)
uninstall-cat-mans:
- $(SHELL) $(top_srcdir)/cf/install-catman.sh uninstall "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
+ $(SHELL) $(top_srcdir)/cf/install-catman.sh uninstall "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man7_MANS) $(man8_MANS)
install-data-hook: install-cat-mans
uninstall-hook: uninstall-cat-mans
@@ -886,12 +1011,12 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEPS)
done
krb5-config: krb5-config.in
- $(subst) $(srcdir)/krb5-config.in > $@.new
+ $(subst) $(srcdir)/krb5-config.in | /bin/sh > $@.new
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 $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tools/cov.sh b/tools/cov.sh
new file mode 100755
index 000000000000..8ceba2d21066
--- /dev/null
+++ b/tools/cov.sh
@@ -0,0 +1,19 @@
+
+d="lib/roken lib/krb5 lib/gssapi lib/ntlm tests/kdc tests/gss kuser"
+
+basedir=$(basedir $0)
+
+${basedir}/../configure CFLAGS='-fprofile-arcs -ftest-coverage' > log
+
+lcov --directory . --zerocounters
+
+make all check > log
+
+lcov --directory . --capture --output-file heimdal-lcov.info
+
+objdir="/Volumes/data/Users/lha/obj/hg"
+srcdir="/Volumes/data/Users/lha/src/heimdal/git"
+
+perl -pi -e "s@SF:$objdir/(.*.[ly])\$@SF:$srcdir/\$1@" heimdal-lcov.info
+
+genhtml heimdal-lcov.info
diff --git a/tools/heimdal-gssapi.pc.in b/tools/heimdal-gssapi.pc.in
index 1d8f2355353d..41adefe4d4b6 100644
--- a/tools/heimdal-gssapi.pc.in
+++ b/tools/heimdal-gssapi.pc.in
@@ -1,14 +1,14 @@
# $Id$
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+libdir=@libdir@
+includedir=@includedir@
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.private: heimdal-krb5
+Libs: -L${libdir} -lgssapi
+Libs.private: -lheimntlm @LIB_crypt@
Cflags: -I${includedir}
diff --git a/tools/heimdal-kadm-client.pc.in b/tools/heimdal-kadm-client.pc.in
new file mode 100644
index 000000000000..2eb9e3e4ebfa
--- /dev/null
+++ b/tools/heimdal-kadm-client.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: heimdal-kadm-client
+Description: Kadmin client library.
+Version: @VERSION@
+Requires.private: heimdal-gssapi
+Libs: -L${libdir} -lkadm5clnt
+Cflags: -I${includedir}
diff --git a/tools/heimdal-kadm-server.pc.in b/tools/heimdal-kadm-server.pc.in
new file mode 100644
index 000000000000..00a78cc3abb8
--- /dev/null
+++ b/tools/heimdal-kadm-server.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: heimdal-kadm-server
+Description: Kadmin server library.
+Version: @VERSION@
+Requires.private: heimdal-gssapi
+Libs: -L${libdir} -lkadm5srv
+Libs.private: @LIB_dbopen@
+Cflags: -I${includedir}
diff --git a/tools/heimdal-krb5.pc.in b/tools/heimdal-krb5.pc.in
new file mode 100644
index 000000000000..a1f139979cbd
--- /dev/null
+++ b/tools/heimdal-krb5.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=Heimdal
+
+Name: heimdal-krb5
+Description: Heimdal implementation of the Kerberos network authentication.
+Version: @VERSION@
+Libs: -L${libdir} -lkrb5
+Libs.private: @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
+Cflags: -I${includedir}
diff --git a/tools/kadm-client.pc.in b/tools/kadm-client.pc.in
new file mode 100644
index 000000000000..f8438856cfa6
--- /dev/null
+++ b/tools/kadm-client.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=Heimdal
+
+Name: kadm-client
+Description: Kadmin client library.
+Version: @VERSION@
+Requires: heimdal-kadm-client
diff --git a/tools/kadm-server.pc.in b/tools/kadm-server.pc.in
new file mode 100644
index 000000000000..9f1e62ec017c
--- /dev/null
+++ b/tools/kadm-server.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=Heimdal
+
+Name: kadm-server
+Description: Kadmin server library.
+Version: @VERSION@
+Requires: heimdal-kadm-server
diff --git a/tools/kafs.pc.in b/tools/kafs.pc.in
new file mode 100644
index 000000000000..bd31f263b54b
--- /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.private: heimdal-krb5
+Libs: -lkafs
diff --git a/tools/krb5-config.1 b/tools/krb5-config.1
index 6d004b54c1a1..ced45de3be2f 100644
--- a/tools/krb5-config.1
+++ b/tools/krb5-config.1
@@ -60,7 +60,9 @@ Print the exec-prefix if no
is specified, otherwise set exec-prefix to
.Ar dir .
.It Fl Fl libs
-Output the set of libraries that should be linked against.
+Output the set of libraries that should be linked against. This also
+includes rpath flags with the expectation that the C compiler is used
+for final link-edits.
.It Fl Fl cflags
Output the set of flags to give to the C compiler when using the
Heimdal libraries.
diff --git a/tools/krb5-config.cat1 b/tools/krb5-config.cat1
index c064e2053d1b..900fc3775828 100644
--- a/tools/krb5-config.cat1
+++ b/tools/krb5-config.cat1
@@ -23,7 +23,9 @@ DDEESSCCRRIIPPTTIIOONN
Print the exec-prefix if no _d_i_r is specified, otherwise set exec-
prefix to _d_i_r.
- ----lliibbss Output the set of libraries that should be linked against.
+ ----lliibbss Output the set of libraries that should be linked against. This
+ also includes rpath flags with the expectation that the C com-
+ piler is used for final link-edits.
----ccffllaaggss
Output the set of flags to give to the C compiler when using the
diff --git a/tools/krb5-config.in b/tools/krb5-config.in
index 317270e4263b..640853033936 100755
--- a/tools/krb5-config.in
+++ b/tools/krb5-config.in
@@ -1,6 +1,9 @@
#!/bin/sh
+
+cat <<'EOM'
+#!/bin/sh
#
-# Copyright (c) 2000 - 2008 Kungliga Tekniska H�gskolan
+# Copyright (c) 2000 - 2008 Kungliga Tekniska Högskolan
# (Royal Institute of Technology, Stockholm, Sweden).
# All rights reserved.
#
@@ -32,12 +35,19 @@
# SUCH DAMAGE.
#
+do_all=no
do_libs=no
+do_lib_deps=no
do_cflags=no
do_usage=no
print_prefix=no
print_exec_prefix=no
-library=krb5
+library=
+lib_krb5=no
+lib_gssapi=no
+lib_kadm_client=no
+lib_kadm_server=no
+lib_kafs=no
if test $# -eq 0; then
do_usage=yes
@@ -50,6 +60,13 @@ for i in $*; do
do_usage=yes
usage_exit=0
;;
+ --all)
+ do_all=yes
+ ;;
+ --vendor)
+ echo "Heimdal"
+ exit 0;
+ ;;
--version)
echo "@PACKAGE@ @VERSION@"
exit 0
@@ -69,23 +86,31 @@ for i in $*; do
--libs)
do_libs=yes
;;
+ --deps)
+ do_lib_deps=yes
+ ;;
--cflags)
do_cflags=yes
;;
krb5)
library=krb5
+ lib_krb5=yes
;;
gssapi)
library=gssapi
+ lib_gssapi=yes
;;
kadm-client)
library=kadm-client
+ lib_kadm_client=yes
;;
kadm-server)
library=kadm-server
+ lib_kadm_server=yes
;;
kafs)
library=kafs
+ lib_kafs=yes
;;
*)
echo "unknown option: $i"
@@ -96,11 +121,28 @@ done
if test "$do_usage" = "yes"; then
echo "usage: $0 [options] [libraries]"
- echo "options: [--prefix[=dir]] [--exec-prefix[=dir]] [--libs] [--cflags]"
- echo "libraries: krb5 gssapi kadm-client kadm-server kafs"
+ echo "options: [--help] show this message"
+ echo " [--all] display version, vendor, etc."
+ echo " [--version] display version information"
+ echo " [--prefix] display the prefix of Kerberos"
+ echo " [--exec-prefix] display the exec_prefix of Kerberos"
+ echo " [--cflags] display the CFLAGS required"
+ echo " [--libs] display the libraries required to link"
+ echo " [--deps] display the dependent libs required"
+ echo " for static linking"
+ echo
+ echo "libraries: krb5 Kerberos 5 applications"
+ echo " gssapi GSSAPI applications"
+ echo " kadm-client libkadm5 client"
+ echo " kadm-server libkadm5 server"
+ echo " kafs kafs"
exit $usage_exit
fi
+if test X"$library" = X; then
+ lib_krb5=yes
+fi
+
if test "$prefix" = ""; then
prefix=@prefix@
fi
@@ -111,38 +153,114 @@ fi
libdir=@libdir@
includedir=@includedir@
+if test "$do_all" = "yes"; then
+ echo "Version: @PACKAGE@ @VERSION@"
+ echo "Vendor: Heimdal"
+ echo "Prefix: $prefix"
+ echo "Exec_prefix: $exec_prefix"
+ exit 0
+fi
+
if test "$print_prefix" = "yes"; then
echo $prefix
+ exit 0
fi
if test "$print_exec_prefix" = "yes"; then
echo $exec_prefix
+ exit 0
fi
+# The following rpath_flag setting code is distilled from MIT Kerberos'
+# src/config/shlib.conf. Some of this seems ancient and likely to be
+# wrong in some cases, but right for all the cases we probably care
+# about. Also, this will very likely be wrong depending on how the
+# caller will be doing link-edits (with what compiler-driver or
+# link-editor)! There's no fixing this.
+#
+# In principle this doesn't belong here: application should instead use
+# krb5-config --libdir to get the directory to use for the rpath, then
+# workout the rpath flags on their own. Of course, there's no --libdir
+# option... And MIT's krb5-config does include rpath flags.
+#
+# Compatibility with MIT is the winning consideration for now.
+EOM
+
+case "@CANONICAL_HOST@" in
+alpha*-dec-osf*)
+ rpath_flag='-Wl,-rpath -Wl,';;
+*-*-hpux*)
+ rpath_flag='-Wl,+b,';;
+*-*-irix* | mips-*-netbsd*)
+ rpath_flag='-Wl,-rpath -Wl,';;
+*-*-netbsd* | *-*-openbsd* | *-*-solaris*)
+ rpath_flag='-R';;
+*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-freebsd*)
+ rpath_flag='-Wl,--enable-new-dtags -Wl,-rpath -Wl,';;
+*-*-aix*)
+ rpath_flag='-Wl,-blibpath:';;
+*)
+rpath_flag=;;
+esac
+
+echo "rpath_flag='$rpath_flag'"
+
+cat <<'EOM'
+
if test "$do_libs" = "yes"; then
- lib_flags="-L${libdir}"
- case $library in
- gssapi)
- lib_flags="$lib_flags -lgssapi -lheimntlm"
- ;;
- kadm-client)
+ deplibs=""
+ if test "$lib_gssapi" = yes; then
+ lib_flags="$lib_flags -lgssapi"
+ deplibs="$deplibs -lheimntlm"
+ if test X"$do_lib_deps" = Xyes; then
+ lib_krb5=yes
+ fi
+ fi
+ if test "$lib_kadm_client" = yes; then
lib_flags="$lib_flags -lkadm5clnt"
- ;;
- kadm-server)
- lib_flags="$lib_flags -lkadm5srv @LIB_dbopen@"
- ;;
- kafs)
+ if test X"$do_lib_deps" = Xyes; then
+ lib_krb5=yes
+ fi
+ fi
+ if test "$lib_kadm_server" = yes; then
+ lib_flags="$lib_flags -lkadm5srv"
+ deplibs="$deplibs @LIB_dbopen@"
+ if test X"$do_lib_deps" = Xyes; then
+ lib_krb5=yes
+ fi
+ fi
+ if test "$lib_kafs" = yes; then
lib_flags="$lib_flags -lkafs"
- ;;
- esac
- lib_flags="$lib_flags -lkrb5 @LIB_pkinit@ -lcom_err"
- lib_flags="$lib_flags @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken"
- lib_flags="$lib_flags @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@"
- lib_flags="$lib_flags @LIB_door_create@ @LIBS@"
- echo $lib_flags
+ if test X"$do_lib_deps" = Xyes; then
+ lib_krb5=yes
+ fi
+ fi
+ if test "$lib_krb5" = yes; then
+ lib_flags="$lib_flags -lkrb5"
+ fi
+ deplibs="$deplibs @LIB_pkinit@ -lcom_err"
+ deplibs="$deplibs @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken"
+ deplibs="$deplibs @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@"
+ deplibs="$deplibs @LIB_door_create@ @LIBS@"
+ if test X"$do_lib_deps" = X"yes"; then
+ lib_flags="$lib_flags $deplibs"
+ fi
+ if test X"$libdir" != X/usr/lib; then
+ lib_flags="-L${libdir} $lib_flags"
+ if test X"$rpath_flag" != X; then
+ lib_flags="${rpath_flag}${libdir} $lib_flags"
+ fi
+ fi
+
+ echo ${lib_flags}
fi
if test "$do_cflags" = "yes"; then
- echo "-I${includedir} @INCLUDE_hcrypto@"
+ cflags=""
+ if test X"${includedir}" != X/usr/include; then
+ cflags="-I${includedir} $cflags"
+ fi
+ echo $cflags
fi
exit 0
+EOM
diff --git a/tools/krb5-gssapi.pc.in b/tools/krb5-gssapi.pc.in
new file mode 100644
index 000000000000..482b78f03d68
--- /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 000000000000..5ed2007c58b4
--- /dev/null
+++ b/tools/krb5.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+vendor=Heimdal
+
+Name: krb5
+Description: Heimdal implementation of the kerberos network authentication.
+Version: @VERSION@
+Requires: heimdal-krb5