Sync with new Kerberos reality. Also, the switch to i386/ELF made

NEWDYNLIBDIR needed again :(.
This commit is contained in:
marcm 2003-05-25 22:10:22 +00:00
parent 08b3b32eea
commit 6f55a2e56d
4 changed files with 7 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2003/04/10 15:59:49 marcm Exp $
# $OpenBSD: Makefile,v 1.10 2003/05/25 22:10:22 marcm Exp $
COMMENT= "integrated email and PIM software for GNOME"
COMMENT-devguide= "Evolution Developer's Guide"
@ -49,7 +49,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-db3-includes=${DB3_WRKBUILD}
CONFIGURE_ARGS+= --with-db3-libs=${DB3_WRKBUILD}
CONFIGURE_ARGS+= --with-krb5=/usr
CONFIGURE_ARGS+= --with-krb4=/usr
#CONFIGURE_ARGS+= --enable-ipv6
CONFIGURE_ARGS+= --enable-openssl
CONFIGURE_ARGS+= --disable-pilot-conduits

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_in,v 1.4 2003/04/10 15:59:49 marcm Exp $
$OpenBSD: patch-configure_in,v 1.5 2003/05/25 22:10:22 marcm Exp $
--- configure.in.orig Mon Mar 31 08:32:50 2003
+++ configure.in Fri Apr 4 11:07:05 2003
@@ -86,7 +86,8 @@ AC_CHECK_HEADERS(alloca.h)
@ -15,7 +15,7 @@ $OpenBSD: patch-configure_in,v 1.4 2003/04/10 15:59:49 marcm Exp $
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ openbsdkerblibs="-lkrb5 -lcrypto -lasn1 -lgssapi"
+ openbsdkerblibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
[
LDFLAGS="$LDFLAGS -L$with_krb5/lib $mitlibs"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2003/02/23 23:10:08 marcm Exp $
@comment $OpenBSD: PFRAG.shared,v 1.6 2003/05/25 22:10:23 marcm Exp $
lib/evolution/1.2/camel-providers/libcamelimap.so
lib/evolution/1.2/camel-providers/libcamellocal.so
lib/evolution/1.2/camel-providers/libcamelpop3.so
@ -18,3 +18,4 @@ lib/libeshell.so.0.0
lib/libevolution-importer.so.0.0
lib/libwombat.so.0.0
DYNLIBDIR(%D/lib)
NEWDYNLIBDIR(%D/lib/evolution/1.2)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2003/04/10 15:59:49 marcm Exp $
@comment $OpenBSD: PLIST,v 1.6 2003/05/25 22:10:23 marcm Exp $
bin/csv2vcard
bin/evolution
bin/evolution-addressbook
@ -111,6 +111,7 @@ include/camel/camel-provider.h
include/camel/camel-sasl-anonymous.h
include/camel/camel-sasl-cram-md5.h
include/camel/camel-sasl-digest-md5.h
include/camel/camel-sasl-gssapi.h
include/camel/camel-sasl-kerberos4.h
include/camel/camel-sasl-login.h
include/camel/camel-sasl-ntlm.h