$OpenBSD: patch-configure,v 1.5 2003/06/26 18:20:20 jakob Exp $
--- configure.orig	Mon Apr 14 20:07:48 2003
+++ configure	Wed Jun 25 23:50:09 2003
@@ -2442,7 +2442,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
+#LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 2448 "configure"
 #include "confdefs.h"
@@ -4797,7 +4797,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
+#LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 4803 "configure"
 #include "confdefs.h"
@@ -4831,7 +4831,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lresolv $LIBS"
+  #LIBS="-lresolv $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
@@ -5149,7 +5149,7 @@ EOF
 #define HAVE_KRB 1
 EOF
 
-    SASL_KRB_LIB="$SASL_KRB_LIB $LIB_DES $COM_ERR"
+    SASL_KRB_LIB="$SASL_KRB_LIB $LIB_DES"
   else
     echo "$ac_t""disabled" 1>&6
   fi
@@ -5261,7 +5261,7 @@ fi
 
  if test "$gssapi" != no; then
     if test -d ${gssapi}; then
-       CPPFLAGS="$CPPFLAGS -I$gssapi/include"
+       CPPFLAGS="$CPPFLAGS -I$gssapi/include/kerberosV"
        LDFLAGS="$LDFLAGS -L$gssapi/lib"
     fi
     ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'`
@@ -5394,7 +5394,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
+#LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 5400 "configure"
 #include "confdefs.h"
@@ -5428,7 +5428,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lresolv $LIBS"
+  #LIBS="-lresolv $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
@@ -5456,7 +5456,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
+LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} -lcom_err $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 5462 "configure"
 #include "confdefs.h"
@@ -5494,8 +5494,8 @@ fi
      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
   elif test "$gss_impl" = "heimdal"; then
-     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 ${LIB_CRYPT} -lcom_err"
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
   else
      gssapi="no"
      echo "configure: warning: Disabling GSSAPI" 1>&2
@@ -5548,7 +5548,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
+#LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 5554 "configure"
 #include "confdefs.h"
@@ -5576,7 +5576,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
+#  GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -6256,7 +6256,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
+#LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 6262 "configure"
 #include "confdefs.h"
@@ -6290,7 +6290,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lresolv $LIBS"
+  #LIBS="-lresolv $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
