mirror of
https://git.freebsd.org/ports.git
synced 2025-06-03 03:46:30 -04:00
da3e156fec
PR: 152071 Submitted by: Joerg Pulz <Joerg.Pulz@frm2.tum.de> Approved by: maintainer timeout Feature safe: yes
98 lines
3.9 KiB
Text
98 lines
3.9 KiB
Text
--- configure.orig 2009-05-07 16:24:25.000000000 +0200
|
|
+++ configure 2010-11-09 10:26:27.000000000 +0100
|
|
@@ -1586,6 +1586,7 @@
|
|
fi
|
|
echo "$as_me:$LINENO: result: yes" >&5
|
|
echo "${ECHO_T}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.
|
|
@@ -5147,7 +5148,7 @@
|
|
fi
|
|
|
|
saved_LIBS=$LIBS
|
|
- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
|
|
+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
|
|
do
|
|
LIBS="$saved_LIBS -l$dbname"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
@@ -5157,6 +5158,7 @@
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
+#include <stdio.h>
|
|
#include <db.h>
|
|
int
|
|
main ()
|
|
@@ -5904,7 +5906,7 @@
|
|
fi
|
|
|
|
saved_LIBS=$LIBS
|
|
- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
|
|
+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
|
|
do
|
|
LIBS="$saved_LIBS -l$dbname"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
@@ -5914,6 +5916,7 @@
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
+#include <stdio.h>
|
|
#include <db.h>
|
|
int
|
|
main ()
|
|
@@ -7215,6 +7218,8 @@
|
|
SASLAUTHD_TRUE='#'
|
|
SASLAUTHD_FALSE=
|
|
fi
|
|
+SASLAUTHD_TRUE='#'
|
|
+SASLAUTHD_FALSE=
|
|
|
|
echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
|
|
echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6
|
|
@@ -10672,7 +10677,7 @@
|
|
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="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|
|
@@ -11082,7 +11087,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 `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
|
|
@@ -11119,7 +11124,7 @@
|
|
# in gssapi\rfckrb5.h
|
|
#
|
|
if test "$gssapi" != "no"; then
|
|
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
|
|
+ if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03" -o "$gss_impl" = "heimdal"; then
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|
|
@@ -11190,7 +11195,7 @@
|
|
|
|
fi
|
|
|
|
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
|
|
+ if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03" -o "$gss_impl" = "heimdal"; then
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|
|
@@ -11920,7 +11925,7 @@
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpq $LIBS"
|
|
+LIBS="-lpq $GSSAPIBASE_LIBS $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|