summaryrefslogtreecommitdiff
path: root/security/cyrus-sasl/patches/patch-aa
blob: afd3619a60654275021be9eed58df4a071b90bd7 (plain)
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
$NetBSD: patch-aa,v 1.4 2001/12/10 12:43:21 martti Exp $

--- configure.in.orig	Fri Jul 21 04:35:01 2000
+++ configure.in	Mon Dec 10 13:26:32 2001
@@ -65,9 +65,12 @@
 
 dnl check for -R, etc. switch
 CMU_GUESS_RUNPATH_SWITCH
-dnl let's just link against local.  otherwise we never find anything useful.
-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
-CMU_ADD_LIBPATH("/usr/local/lib")
+
+AC_PATH_PROG(SED, sed, no)
+if test "$SED" = "no"; then
+  AC_ERROR([sed is required to build sasl-config])
+fi
+AC_SUBST(SED)
 
 AM_DISABLE_STATIC
 
@@ -352,8 +355,11 @@
     CPPFLAGS="$CPPFLAGS -I${with_des}/include"
     LDFLAGS="$LDFLAGS -L${with_des}/lib"
   fi
-  AC_CHECK_LIB(des, des_pcbc_encrypt, [LIB_DES="-ldes";
-				       with_des=yes], with_des=no)
+  AC_CHECK_LIB(des, des_pcbc_encrypt,
+	AC_CHECK_HEADER(des.h, [LIB_DES="-ldes";
+				with_des=yes],
+			with_des=no),
+	with_des=no)
 
   if test "$with_des" = no; then
     dnl if openssl is around, we might be able to use that for des
@@ -464,7 +470,7 @@
 
 if test "$gssapi" != no; then
   if test -d ${gssapi}; then
-     CPPFLAGS="$CPPFLAGS -I$gssapi/include"
+     CPPFLAGS="$CPPFLAGS -I$gssapi/include -I$gssapi/include/krb5"
      LDFLAGS="$LDFLAGS -L$gssapi/lib"
   fi
   AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H),
@@ -694,6 +700,9 @@
 
 LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
 AC_SUBST(LTLIBOBJS)
+
+dnl Check for /dev/urandom
+AC_CHECK_FILE(/dev/urandom, AC_DEFINE_UNQUOTED(SASL_DEV_RANDOM, "/dev/urandom"))
 
 AC_CHECK_HEADERS(getopt.h unistd.h crypt.h pwd.h shadow.h paths.h)
 AC_C_CONST