88 lines
3.1 KiB
Text
88 lines
3.1 KiB
Text
$NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $
|
|
|
|
--- configure.orig 2006-05-18 15:30:13.000000000 -0400
|
|
+++ configure
|
|
@@ -1334,8 +1334,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
|
|
|
|
-if test $cache_file = "/dev/null"; then
|
|
-cache_file="./config.cache"
|
|
if test -r "$cache_file"; then
|
|
# Some versions of bash will fail to source /dev/null (special
|
|
# files actually), so we avoid doing that.
|
|
@@ -1353,8 +1351,6 @@ echo "$as_me: creating cache $cache_file
|
|
>$cache_file
|
|
fi
|
|
|
|
-fi
|
|
-
|
|
ac_aux_dir=
|
|
for ac_dir in config $srcdir/config; do
|
|
if test -f $ac_dir/install-sh; then
|
|
@@ -5125,7 +5121,7 @@ if test $ac_cv_header_db_h = yes; then
|
|
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 ${BDB_TYPE} 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
|
|
@@ -5156,7 +5152,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
ac_status=$?
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; }; then
|
|
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
|
|
+ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
@@ -5882,7 +5878,7 @@ if test $ac_cv_header_db_h = yes; then
|
|
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 ${BDB_TYPE} 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
|
|
@@ -5913,7 +5909,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
ac_status=$?
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; }; then
|
|
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
|
|
+ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
@@ -11304,8 +11300,15 @@ if test $ac_cv_lib_resolv_res_search = y
|
|
fi
|
|
|
|
SASL_MECHS="$SASL_MECHS libgssapiv2.la"
|
|
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
|
|
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
|
|
+ if test "$enable_static" = yes; then
|
|
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
|
|
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
|
|
+
|
|
+cat >>confdefs.h <<\_ACEOF
|
|
+#define STATIC_GSSAPIV2
|
|
+_ACEOF
|
|
+
|
|
+ fi
|
|
|
|
cmu_save_LIBS="$LIBS"
|
|
LIBS="$LIBS $GSSAPIBASE_LIBS"
|
|
@@ -11403,11 +11406,6 @@ fi
|
|
|
|
|
|
if test "$gssapi" != "no"; then
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STATIC_GSSAPIV2
|
|
-_ACEOF
|
|
-
|
|
mutex_default="no"
|
|
if test "$gss_impl" = "mit"; then
|
|
mutex_default="yes"
|