1 diff -urN evolution-2.12.0/configure.in evolution-2.12.0.new/configure.in
2 --- evolution-2.12.0/configure.in 2007-09-17 08:27:28.000000000 +0200
3 +++ evolution-2.12.0.new/configure.in 2007-09-26 21:50:58.000000000 +0200
7 if test "x${with_krb5}" != "xno"; then
8 - LDFLAGS_save="$LDFLAGS"
11 mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
12 heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
13 sunlibs="-lkrb5 -lgss"
14 AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
16 - LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
17 + LIBS="$LIBS -L$with_krb5_libs $mitlibs"
18 AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
20 - LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
21 + LIBS="$LIBS_save -L$with_krb5_libs $heimlibs"
22 AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs",
24 - LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs"
25 + LIBS="$LIBS_save -L$with_krb5_libs $sunlibs"
26 AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$sunlibs", ac_cv_lib_kerberos5="no")
29 - LDFLAGS="$LDFLAGS_save"
32 if test "$ac_cv_lib_kerberos5" != "no"; then
33 AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5])
37 if test "x${with_krb4}" != "xno"; then
38 - LDFLAGS_save="$LDFLAGS"
40 AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4,
42 ac_cv_lib_kerberos4="no"
44 mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
45 # Look for MIT krb5 compat krb4
46 - LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs"
47 + LIBS="$LIBS -L$with_krb4_libs $mitcompatlibs"
48 AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="$mitcompatlibs")
50 if test "$ac_cv_lib_kerberos4" = "no"; then
52 - LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"
53 + LIBS="$LIBS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"
54 AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken")
56 if test "$ac_cv_lib_kerberos4" = "no"; then
57 # Look for old MIT krb4
58 - LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb"
59 + LIBS="$LIBS_save -L$with_krb4_libs -lkrb"
60 AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb",
62 - LDFLAGS="$LDFLAGS -ldes"
64 AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -ldes")
68 - LDFLAGS="$LDFLAGS_save"
70 if test "$ac_cv_lib_kerberos4" != "no"; then
71 AC_DEFINE(HAVE_KRB4,1,[Define if you have Krb4])
73 --- evolution-2.24.0.orig/plugins/exchange-operations/Makefile.am 2008-10-03 20:33:29.000000000 +0200
74 +++ evolution-2.24.0/plugins/exchange-operations/Makefile.am 2008-10-03 20:33:22.000000000 +0200
76 $(top_builddir)/calendar/gui/libevolution-calendar.la \
77 $(top_builddir)/mail/libevolution-mail.la \
78 $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
79 + $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
80 $(CAMEL_EXCHANGE_LIBS) \
81 $(EVOLUTION_MAIL_LIBS)