Repair imap FLAVOR:
- c-client is at shlib version 3 now - link in with kerberos libraries like php4 pointed out by brad, tested by heko, ok naddy
This commit is contained in:
parent
e529f84b99
commit
054209e023
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.35 2001/08/17 19:34:51 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.36 2001/10/15 23:45:45 avsm Exp $
|
||||
|
||||
COMMENT= "server-side HTML-embedded scripting language"
|
||||
|
||||
@ -37,8 +37,8 @@ FLAVORS= imap gd mysql postgresql
|
||||
FLAVOR?=
|
||||
|
||||
.if ${FLAVOR:L:Mimap}
|
||||
CONFIGURE_ARGS+= --with-imap=${PREFIX}
|
||||
LIB_DEPENDS+= c-client.2::mail/c-client
|
||||
CONFIGURE_ARGS+= --with-imap=${LOCALBASE}
|
||||
LIB_DEPENDS+= c-client.3::mail/c-client
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-imap
|
||||
.endif
|
||||
|
@ -1,13 +1,7 @@
|
||||
--- configure.orig Wed Apr 5 01:32:58 2000
|
||||
+++ configure Tue Jul 18 23:39:15 2000
|
||||
@@ -5133,14 +5133,14 @@
|
||||
withval=/usr/local
|
||||
elif test -f /usr/include/mail.h; then
|
||||
withval=/usr
|
||||
- elif test -f /usr/include/imap/mail.h; then
|
||||
+ elif test -f /usr/include/c-client/mail.h; then
|
||||
withval=/usr
|
||||
fi
|
||||
$OpenBSD: patch-configure,v 1.2 2001/10/15 23:45:45 avsm Exp $
|
||||
--- configure.orig Fri Oct 20 19:05:17 2000
|
||||
+++ configure Mon Oct 15 01:11:36 2001
|
||||
@@ -5157,8 +5157,8 @@
|
||||
fi
|
||||
if test "$withval" != "no" && test "$withval" != "yes"; then
|
||||
IMAP_DIR=$withval
|
||||
@ -18,3 +12,58 @@
|
||||
else
|
||||
IMAP_INC_DIR=$withval/include
|
||||
fi
|
||||
@@ -5329,6 +5329,54 @@
|
||||
|
||||
fi
|
||||
|
||||
+
|
||||
+
|
||||
+ unique=`echo $ac_n "gssapi$ac_c" | tr -c -d a-zA-Z0-9`
|
||||
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
||||
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
||||
+ eval "LIBRARY$unique=set"
|
||||
+
|
||||
+ EXTRA_LIBS="$EXTRA_LIBS -lgssapi"
|
||||
+
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+ unique=`echo $ac_n "asn1$ac_c" | tr -c -d a-zA-Z0-9`
|
||||
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
||||
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
||||
+ eval "LIBRARY$unique=set"
|
||||
+
|
||||
+ EXTRA_LIBS="$EXTRA_LIBS -lasn1"
|
||||
+
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+ unique=`echo $ac_n "krb5$ac_c" | tr -c -d a-zA-Z0-9`
|
||||
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
||||
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
||||
+ eval "LIBRARY$unique=set"
|
||||
+
|
||||
+ EXTRA_LIBS="$EXTRA_LIBS -lkrb5"
|
||||
+
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+ unique=`echo $ac_n "com_err$ac_c" | tr -c -d a-zA-Z0-9`
|
||||
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
||||
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
||||
+ eval "LIBRARY$unique=set"
|
||||
+
|
||||
+ EXTRA_LIBS="$EXTRA_LIBS -lcom_err"
|
||||
+
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_IMAP 1
|
||||
EOF
|
||||
|
Loading…
x
Reference in New Issue
Block a user