--- configure.ac.old	2007-04-06 20:10:58.000000000 +0200
+++ configure.ac	2007-07-17 00:59:39.000000000 +0200
@@ -508,8 +508,9 @@
      if test -f "$dir/include/krb5.h" || test -f "$dir/include/krb5/krb5.h"
      then
 	if test -d "$dir/include/krb5" ; then CPFLAGS="$CPFLAGS -I$dir/include/krb5" ; fi
+	if test -d "$dir/include/heimdal" ; then CPFLAGS="$CPFLAGS -I$dir/include/heimdal" ; fi
         ac_krblibs=
-        if test -f "$dir/include/roken.h" || test -f "$dir/include/krb5/roken.h"
+        if test -f "$dir/include/roken.h" || test -f "$dir/include/krb5/roken.h" || test -f "$dir/include/heimdal/roken.h"
         then
            ac_krblibs="-lasn1 -lroken -lcom_err"
            AC_MSG_RESULT([Heimdal found])
@@ -518,7 +519,7 @@
            AC_CHECK_LIB(db2, db_open, ac_krblibs="$ac_krblibs -ldb2", [],
                 ${LDEFLAGS})
            AC_CHECK_LIB(des, des_string_to_key, libk5crypto=-ldes,
-              AC_CHECK_LIB(ssl, MD5_Init, [],
+              AC_CHECK_LIB(crypto, MD5_Init, [],
                 AC_MSG_ERROR([DES libraries not found. Try adding --with-ssl to enable OpenSSL support]),
                 ${LDEFLAGS} ${ac_krblibs}),
            ${LDEFLAGS} ${ac_krblibs})
@@ -797,7 +798,7 @@
       if test "$with_gssapi" = yes ; then
 	  with_gssapi=/usr
       fi
-      if test -f "$with_gssapi/include/roken.h" -o -f "$with_gssapi/include/krb5/roken.h"
+      if test -f "$with_gssapi/include/roken.h" -o -f "$with_gssapi/include/krb5/roken.h" -o -f "$with_gssapi/include/heimdal/roken.h"
       then
          # have roken.h, assume Heimdal
 	 case `uname` in
@@ -816,7 +817,7 @@
   fi
   AC_DEFINE(GSSAPI,1,Define if you want GSSAPI authentication)
   if test "$with_gssapi" != yes ; then
-    CPPFLAGS="-I$with_gssapi/include"
+    CPPFLAGS="`krb5-config --cflags gssapi`"
   fi
   AC_CHECK_HEADERS(gss.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
   if test "$ac_cv_header_gssapi_h" = "yes"; then