From 78a638f64bd9b3db891f0e98af656038435b7fc2 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Fri, 24 Sep 2010 17:25:25 +0200
Subject: [PATCH] use pkgconfig

---
 acinclude.m4       | 9 +++------
 init_sec_context.c | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 4e15e0e..0ac828b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -11,10 +11,10 @@ AC_ARG_WITH(krb5,
     [check_krb5_dir=])
 for dir in $check_krb5_dir /usr /usr/local ; do
    krb5dir="$dir"
-   if test -f "$dir/include/krb5.h"; then
+   if test -x "$dir/bin/krb5-config"; then
      found_krb5="yes";
-     KRB5_DIR="${krb5dir}"
-     KRB5_CFLAGS="-I$krb5dir/include";
+     KRB5_CFLAGS=`$dir/bin/krb5-config gssapi --cflags`;
+     KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`;
      break;
    fi
 done
@@ -30,10 +30,7 @@ if test x_$found_krb5 != x_yes; then
 ])
 else
 	printf "Kerberos found in $krb5dir\n";
-	KRB5_LIBS="-lgssapi_krb5 -lkrb5 -lk5crypto";
-	KRB5_LDFLAGS="-L$krb5dir/lib";
 	AC_SUBST(KRB5_CFLAGS)
-	AC_SUBST(KRB5_LDFLAGS)
 	AC_SUBST(KRB5_LIBS)
 	AC_CHECK_LIB(gssapi_krb5, GSS_C_NT_COMPOSITE_EXPORT, [AC_DEFINE_UNQUOTED([HAVE_GSS_C_NT_COMPOSITE_EXPORT], 1, [Define if GSS-API library supports recent naming extensions draft])], [], "$KRB5_LDFLAGS")
 fi
diff --git a/init_sec_context.c b/init_sec_context.c
index 8d55101..cdc5ddb 100644
--- a/init_sec_context.c
+++ b/init_sec_context.c
@@ -639,6 +639,7 @@ gss_init_sec_context(OM_uint32 *minor,
             goto cleanup;
         }
     } else {
+        /* XXX TODO should we store this in the context handle? */
         major = gssEapAcquireCred(minor, GSS_C_NO_NAME, GSS_C_NO_BUFFER,
                                   time_req, GSS_C_NO_OID_SET, GSS_C_INITIATE,
                                   &defaultCred, NULL, NULL);
-- 
2.1.4