96 lines
3.6 KiB
Text
96 lines
3.6 KiB
Text
Index: configure
|
|
diff -u configure.orig configure
|
|
--- configure.orig 2012-11-07 04:21:37.000000000 +0900
|
|
+++ configure 2014-03-25 18:24:59.021374856 +0900
|
|
@@ -2365,6 +2365,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.
|
|
@@ -6329,6 +6330,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"
|
|
@@ -7156,6 +7158,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"
|
|
@@ -8700,6 +8703,8 @@
|
|
SASLAUTHD_TRUE='#'
|
|
SASLAUTHD_FALSE=
|
|
fi
|
|
+SASLAUTHD_TRUE='#'
|
|
+SASLAUTHD_FALSE=
|
|
|
|
{ $as_echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
|
|
$as_echo_n "checking if I should include saslauthd... " >&6; }
|
|
@@ -12552,6 +12557,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.
|
|
@@ -12571,7 +12577,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
|
|
@@ -13047,7 +13053,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
|
|
@@ -14479,7 +14485,7 @@
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpq $LIBS"
|
|
+LIBS="-lpq $GSSAPIBASE_LIBS $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -14591,9 +14597,9 @@
|
|
$as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;;
|
|
*)
|
|
if test -d ${with_sqlite}/lib; then
|
|
- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
|
|
+ LIB_SQLITE="-L${with_sqlite}/lib $andrew_cv_runpath_switch${with_sqlite}/lib"
|
|
else
|
|
- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
|
|
+ LIB_SQLITE="-L${with_sqlite} $andrew_cv_runpath_switch${with_sqlite}"
|
|
fi
|
|
|
|
LIB_SQLITE_DIR=$LIB_SQLITE
|
|
@@ -14721,9 +14727,9 @@
|
|
$as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;;
|
|
*)
|
|
if test -d ${with_sqlite3}/lib; then
|
|
- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
|
|
+ LIB_SQLITE3="-L${with_sqlite3}/lib $andrew_cv_runpath_switch${with_sqlite3}/lib"
|
|
else
|
|
- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
|
|
+ LIB_SQLITE3="-L${with_sqlite3} $andrew_cv_runpath_switch${with_sqlite3}"
|
|
fi
|
|
|
|
LIB_SQLITE3_DIR=$LIB_SQLITE3
|