openbsd-ports/security/cyrus-sasl2/patches/patch-configure

69 lines
2.5 KiB
Plaintext

$OpenBSD: patch-configure,v 1.3 2002/12/10 08:37:42 jakob Exp $
--- configure.orig Mon Dec 9 16:45:02 2002
+++ configure Tue Dec 10 00:10:52 2002
@@ -4681,7 +4681,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
@@ -4998,7 +4998,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
@@ -5016,7 +5016,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_%'`
@@ -5183,7 +5183,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
@@ -5211,7 +5211,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 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
+LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lkrb -lkafs -lcrypto -ldes -lasn1 ${LIB_CRYPT} -lcom_err $LIBS"
cat > conftest.$ac_ext <<EOF
#line 5217 "configure"
#include "confdefs.h"
@@ -5249,8 +5249,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 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lkrb -lkafs -lcrypto ${LIB_CRYPT}"
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
else
gssapi="no"
echo "configure: warning: Disabling GSSAPI" 1>&2
@@ -6138,7 +6138,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