a967e7992b
The 1.2 series includes a host of new features including IPv6 support and SSL support via OpenSSL instead of mucking about with Mozilla libraries. For a complete list of the new features, the 1.2 series release notes are here: http://developer.ximian.com/projects/evolution/release_notes/1.2.html while the 1.2.1 release notes are here: http://developer.ximian.com/projects/evolution/release_notes/1.2.1.html ok todd@
94 lines
2.7 KiB
Plaintext
94 lines
2.7 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.3 2003/01/03 21:53:07 marcm Exp $
|
|
--- configure.in.orig Wed Nov 6 10:25:53 2002
|
|
+++ configure.in Mon Nov 11 23:55:32 2002
|
|
@@ -86,7 +86,8 @@ AC_CHECK_HEADERS(alloca.h)
|
|
|
|
dnl check for socklen_t (in Unix98)
|
|
AC_MSG_CHECKING(for socklen_t)
|
|
-AC_TRY_COMPILE([#include <sys/socket.h>
|
|
+AC_TRY_COMPILE([#include <sys/types.h>
|
|
+#include <sys/socket.h>
|
|
socklen_t x;
|
|
],[],[AC_MSG_RESULT(yes)],[
|
|
AC_TRY_COMPILE([#include <sys/socket.h>
|
|
@@ -357,7 +358,7 @@ AC_SUBST(DB3_CFLAGS)
|
|
|
|
CPPFLAGS_save="$CPPFLAGS"
|
|
CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
|
|
-AC_CHECK_HEADERS(db.h db3/db.h, break)
|
|
+AC_CHECK_HEADERS(db3.h db.h db3/db.h, break)
|
|
|
|
AC_CACHE_CHECK([db3 header version], ac_cv_db3_header_version,
|
|
[
|
|
@@ -365,8 +366,12 @@ AC_CACHE_CHECK([db3 header version], ac_
|
|
#ifdef HAVE_DB3_DB_H
|
|
#include <db3/db.h>
|
|
#else
|
|
+ #ifdef HAVE_DB3_H
|
|
+ #include <db3.h>
|
|
+ #else
|
|
#include <db.h>
|
|
#endif
|
|
+ #endif
|
|
],[
|
|
#if DB_VERSION_MAJOR != $evolution_db_version_major || \
|
|
DB_VERSION_MINOR != $evolution_db_version_minor || \
|
|
@@ -389,8 +394,12 @@ AC_CACHE_CHECK([for db3 library name], a
|
|
#ifdef HAVE_DB3_DB_H
|
|
#include <db3/db.h>
|
|
#else
|
|
+ #ifdef HAVE_DB3_H
|
|
+ #include <db3.h>
|
|
+ #else
|
|
#include <db.h>
|
|
#endif
|
|
+ #endif
|
|
],[
|
|
DB *db;
|
|
db_create (&db, 0, 0);
|
|
@@ -415,8 +424,12 @@ AC_CACHE_CHECK([that db3 library version
|
|
#ifdef HAVE_DB3_DB_H
|
|
#include <db3/db.h>
|
|
#else
|
|
+ #ifdef HAVE_DB3_H
|
|
+ #include <db3.h>
|
|
+ #else
|
|
#include <db.h>
|
|
#endif
|
|
+ #endif
|
|
|
|
int
|
|
main (void)
|
|
@@ -648,20 +661,29 @@ if test ${with_krb5:=no} != no; then
|
|
|
|
mitlibs="-lkrb5 -lk5crypto -lcom_err"
|
|
heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken"
|
|
+ altheimlibs="-lkrb5 -lcrypto -lasn1"
|
|
AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
|
|
[
|
|
LDFLAGS="$LDFLAGS -L$with_krb5/lib $mitlibs"
|
|
AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
|
|
[
|
|
LDFLAGS="$LDFLAGS_save -L$with_krb5/lib $heimlibs"
|
|
- AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5=no)
|
|
+ AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs",
|
|
+ [
|
|
+ LDFLAGS="$LDFLAGS_save -L$with_krb5/lib $altheimlibs"
|
|
+ AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$altheimlibs", ac_cv_lib_kerberos5=no)
|
|
+ ])
|
|
])
|
|
LDFLAGS="$LDFLAGS_save"
|
|
])
|
|
if test "$ac_cv_lib_kerberos5" != no; then
|
|
AC_DEFINE(HAVE_KRB5)
|
|
msg_krb5=yes
|
|
- KRB5_CFLAGS="-I$with_krb5/include/krb5"
|
|
+ if test "$ac_cv_lib_kerberos5" == "$altheimlibs"; then
|
|
+ KRB5_CFLAGS="-I$with_krb5/include/kerberosV"
|
|
+ else
|
|
+ KRB5_CFLAGS="-I$with_krb5/include/krb5"
|
|
+ fi
|
|
KRB5_LDFLAGS="-L$with_krb5/lib $ac_cv_lib_kerberos5"
|
|
fi
|
|
else
|