From abfe7761c2a592b93aaf0a937966fb28c7a0b2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Mon, 27 Mar 2006 12:49:30 +0000
Subject: [PATCH] Add hx509 when using PK-INIT.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16830 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 tools/Makefile.am    | 6 ++++++
 tools/krb5-config.in | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8c05215b6..7160af159 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,6 +10,11 @@ bin_SCRIPTS = krb5-config
 
 man_MANS = krb5-config.1
 
+ifdef PKINT
+LIB_pkinit = -lhx509
+endif
+
+
 krb5-config: krb5-config.in
 	sed	-e "s!@PACKAGE\@!$(PACKAGE)!g" \
 		-e "s!@VERSION\@!$(VERSION)!g" \
@@ -23,6 +28,7 @@ krb5-config: krb5-config.in
 		-e "s!@LIB_des_appl\@!$(LIB_des_appl)!g" \
 		-e "s!@LIB_dlopen\@!$(LIB_dlopen)!g" \
 		-e "s!@LIB_door_create\@!$(LIB_door_create)!g" \
+		-e "s!@LIB_pkinit\@!$(LIB_pkinit)!g" \
 		-e "s!@LIBS\@!$(LIBS)!g" \
 		$(srcdir)/krb5-config.in > $@.new
 	mv $@.new $@
diff --git a/tools/krb5-config.in b/tools/krb5-config.in
index c9b9a4370..911177103 100755
--- a/tools/krb5-config.in
+++ b/tools/krb5-config.in
@@ -99,7 +99,8 @@ if test "$do_libs" = "yes"; then
 	lib_flags="$lib_flags -lkadm5srv @LIB_dbopen@"
 	;;
     esac
-    lib_flags="$lib_flags -lkrb5 -lasn1 -lcom_err @LIB_des_appl@ -lroken"
+    lib_flags="$lib_flags -lkrb5 @LIB_pkinit@ -lasn1 -lcom_err"
+    lib_flags="@LIB_des_appl@ -lroken"
     lib_flags="$lib_flags @LIB_crypt@ @LIB_dlopen@"
     lib_flags="$lib_flags @LIB_door_create@ @LIBS@"
     echo $lib_flags