58 lines
2.9 KiB
Plaintext
58 lines
2.9 KiB
Plaintext
$OpenBSD: patch-saslauthd_configure,v 1.7 2004/07/09 15:07:07 kevlo Exp $
|
|
--- saslauthd/configure.orig Wed Mar 10 15:56:16 2004
|
|
+++ saslauthd/configure Fri Jul 9 16:30:17 2004
|
|
@@ -753,10 +753,10 @@ ac_env_CC_set=${CC+set}
|
|
ac_env_CC_value=$CC
|
|
ac_cv_env_CC_set=${CC+set}
|
|
ac_cv_env_CC_value=$CC
|
|
-ac_env_CFLAGS_set=${CFLAGS+set}
|
|
-ac_env_CFLAGS_value=$CFLAGS
|
|
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
|
|
-ac_cv_env_CFLAGS_value=$CFLAGS
|
|
+# ac_env_CFLAGS_set=${CFLAGS+set}
|
|
+# ac_env_CFLAGS_value=$CFLAGS
|
|
+# ac_cv_env_CFLAGS_set=${CFLAGS+set}
|
|
+# ac_cv_env_CFLAGS_value=$CFLAGS
|
|
ac_env_LDFLAGS_set=${LDFLAGS+set}
|
|
ac_env_LDFLAGS_value=$LDFLAGS
|
|
ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
|
|
@@ -5995,6 +5995,9 @@ fi;
|
|
*-*-aix*)
|
|
platform=__aix
|
|
;;
|
|
+ *-*-openbsd*)
|
|
+ platform=__openbsd
|
|
+ ;;
|
|
*)
|
|
{ echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
|
|
echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
|
|
@@ -6004,7 +6007,7 @@ echo "$as_me: WARNING: The system type i
|
|
cmu_saved_CPPFLAGS=$CPPFLAGS
|
|
|
|
if test -d ${gssapi}; then
|
|
- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
|
|
+ CPPFLAGS="$CPPFLAGS -I$gssapi/include/kerberosV"
|
|
# We want to keep -I in our CPPFLAGS, but only if we succeed
|
|
cmu_saved_CPPFLAGS=$CPPFLAGS
|
|
LDFLAGS="$LDFLAGS -L$gssapi/lib"
|
|
@@ -6385,7 +6388,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
|
|
+LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|
|
@@ -6734,8 +6737,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} ${LIB_DES} -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 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err"
|
|
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libcrypto.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
|
|
elif test "$gss_impl" = "cybersafe03"; then
|
|
# Version of CyberSafe with two libraries
|
|
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
|