summaryrefslogtreecommitdiff
path: root/security/heimdal/files/patch-configure
blob: 4ac5681271fb31a94ba8dbca4164a3c8e01a0758 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
--- configure.orig	2019-06-07 06:23:13 UTC
+++ configure
@@ -792,6 +792,8 @@ CAPNG_CFLAGS
 PKG_CONFIG
 PKINIT_FALSE
 PKINIT_TRUE
+KX509_FALSE
+KX509_TRUE
 OPENLDAP_MODULE_FALSE
 OPENLDAP_MODULE_TRUE
 LIB_openldap
@@ -15041,9 +15043,15 @@ if test "$enable_kx509" != no ;then
 $as_echo "#define KX509 1" >>confdefs.h
 
 fi
+ if test "$enable_kx509" != no; then
+  KX509_TRUE=
+  KX509_FALSE='#'
+else
+  KX509_TRUE='#'
+  KX509_FALSE=
+fi
 
 
-
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -16103,7 +16111,7 @@ case "$host" in
     ;;
 *-*-freebsd*)
 	native_pthread_support=yes
-	PTHREAD_LIBADD="-pthread"
+	PTHREAD_LIBADD="-lpthread"
 	;;
 *-*-openbsd*)
 	native_pthread_support=yes
@@ -16339,7 +16347,7 @@ if ${ac_cv_funclib_db_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-if eval "test \"\$ac_cv_func_db_create\" != yes" ; then
+if eval "test \"\$ac_cv_func_db_create\" = yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" $dbheader db-5 db5 db4 db3 db; do
 		case "$ac_lib" in
@@ -16912,6 +16920,9 @@ esac
 
 $as_echo "#define HAVE_NDBM 1" >>confdefs.h
       have_ndbm=yes
+      if test "$db_type" = "unknown"; then
+      db_type=ndbm
+      fi
     else
 
       $as_unset ac_cv_func_dbm_firstkey
@@ -28663,7 +28674,7 @@ fi
 
 krb_cv_compile_et="no"
 krb_cv_com_err_need_r=""
-krb_cv_compile_et_cross=no
+krb_cv_compile_et_cross=yes
 if test "${COMPILE_ET}" != "no"; then
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compile_et has the features we need" >&5
@@ -29176,6 +29187,10 @@ Usually this means the macro was only invoked conditio
 fi
 if test -z "${PKINIT_TRUE}" && test -z "${PKINIT_FALSE}"; then
   as_fn_error $? "conditional \"PKINIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${KX509_TRUE}" && test -z "${KX509_FALSE}"; then
+  as_fn_error $? "conditional \"KX509\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_CAPNG_TRUE}" && test -z "${HAVE_CAPNG_FALSE}"; then