54 lines
2.2 KiB
Text
54 lines
2.2 KiB
Text
Index: saslauthd/configure
|
|
diff -u saslauthd/configure.orig saslauthd/configure
|
|
--- saslauthd/configure.orig 2012-11-07 04:21:44.000000000 +0900
|
|
+++ saslauthd/configure 2013-01-06 17:15:30.597678365 +0900
|
|
@@ -2185,6 +2185,7 @@
|
|
fi
|
|
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
+program_prefix=NONE
|
|
test "$program_prefix" != NONE &&
|
|
program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
|
# Use a double $ so make ignores it.
|
|
@@ -8301,6 +8302,7 @@
|
|
gssapi_dir="${gssapi}/lib"
|
|
GSSAPIBASE_LIBS="-L$gssapi_dir"
|
|
GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
|
|
+ gssapi_bindir="${gssapi}/bin/"
|
|
else
|
|
# FIXME: This is only used for building cyrus, and then only as
|
|
# a real hack. it needs to be fixed.
|
|
@@ -8320,7 +8322,7 @@
|
|
$as_echo_n "(cached) " >&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="${GSSAPIBASE_LIBS} `${gssapi_bindir}krb5-config --libs gssapi` $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -8796,7 +8798,7 @@
|
|
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
|
|
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_LIBS="$GSSAPIBASE_LIBS `${gssapi_bindir}krb5-config --libs gssapi`"
|
|
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}"
|
|
elif test "$gss_impl" = "cybersafe03"; then
|
|
# Version of CyberSafe with two libraries
|
|
@@ -10065,6 +10067,7 @@
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
+#include <stdio.h>
|
|
#include <db.h>
|
|
_ACEOF
|
|
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
@@ -10892,6 +10895,7 @@
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
+#include <stdio.h>
|
|
#include <db.h>
|
|
_ACEOF
|
|
if { (ac_try="$ac_cpp conftest.$ac_ext"
|