97 lines
3.6 KiB
Plaintext
97 lines
3.6 KiB
Plaintext
$OpenBSD: patch-configure,v 1.9 2005/12/20 05:57:19 pvalchev Exp $
|
|
--- configure.orig Sat May 14 23:58:28 2005
|
|
+++ configure Mon Dec 19 18:27:04 2005
|
|
@@ -3944,7 +3944,7 @@ _ACEOF
|
|
fi
|
|
|
|
if test "$ac_cv_c_compiler_gnu" = yes; then
|
|
- CFLAGS="-Wall -W ${CFLAGS}"
|
|
+ CFLAGS="-Wall -W -fPIC ${CFLAGS}"
|
|
fi
|
|
|
|
|
|
@@ -9447,7 +9447,7 @@ if test $ac_cv_lib_resolv_res_search = y
|
|
#define HAVE_LIBRESOLV 1
|
|
_ACEOF
|
|
|
|
- LIBS="-lresolv $LIBS"
|
|
+ #LIBS="-lresolv $LIBS"
|
|
|
|
fi
|
|
|
|
@@ -10159,6 +10159,9 @@ if test "$gssapi" != no; then
|
|
*-*-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;}
|
|
@@ -10173,7 +10176,7 @@ echo "$as_me: error: CyberSafe was force
|
|
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"
|
|
@@ -10537,7 +10540,7 @@ if test $ac_cv_lib_resolv_res_search = y
|
|
#define HAVE_LIBRESOLV 1
|
|
_ACEOF
|
|
|
|
- LIBS="-lresolv $LIBS"
|
|
+ #LIBS="-lresolv $LIBS"
|
|
|
|
fi
|
|
|
|
@@ -10564,7 +10567,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. */
|
|
@@ -10914,8 +10917,8 @@ fi
|
|
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
|
|
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
|
|
- 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"
|
|
@@ -11154,7 +11157,7 @@ fi
|
|
echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
|
|
echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
|
|
if test $ac_cv_lib_resolv_res_search = yes; then
|
|
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
|
|
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS"
|
|
fi
|
|
|
|
SASL_MECHS="$SASL_MECHS libgssapiv2.la"
|
|
@@ -12760,7 +12763,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lresolv $LIBS"
|
|
+#LIBS="-lresolv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|
|
@@ -12813,7 +12816,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye
|
|
#define HAVE_LIBRESOLV 1
|
|
_ACEOF
|
|
|
|
- LIBS="-lresolv $LIBS"
|
|
+ #IBS="-lresolv $LIBS"
|
|
|
|
fi
|
|
|