]>
Commit | Line | Data |
---|---|---|
868a7fc5 MB |
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 | |
4 | @@ -758,24 +758,24 @@ | |
5 | ||
6 | msg_krb5="no" | |
7 | if test "x${with_krb5}" != "xno"; then | |
8 | - LDFLAGS_save="$LDFLAGS" | |
9 | + LIBS_save="$LIBS" | |
10 | ||
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, | |
15 | [ | |
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", | |
19 | [ | |
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", | |
23 | [ | |
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") | |
27 | ]) | |
28 | ]) | |
29 | - LDFLAGS="$LDFLAGS_save" | |
30 | + LIBS="$LIBS_save" | |
31 | ]) | |
32 | if test "$ac_cv_lib_kerberos5" != "no"; then | |
33 | AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5]) | |
34 | @@ -818,32 +818,32 @@ | |
35 | ||
36 | msg_krb4="no" | |
37 | if test "x${with_krb4}" != "xno"; then | |
38 | - LDFLAGS_save="$LDFLAGS" | |
39 | + LIBS_save="$LIBS" | |
40 | AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4, | |
41 | [ | |
42 | ac_cv_lib_kerberos4="no" | |
43 | ||
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") | |
49 | ||
50 | if test "$ac_cv_lib_kerberos4" = "no"; then | |
51 | # Look for KTH krb4 | |
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") | |
55 | fi | |
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", | |
61 | [ | |
62 | - LDFLAGS="$LDFLAGS -ldes" | |
63 | + LIBS="$LIBS -ldes" | |
64 | AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -ldes") | |
65 | ]) | |
66 | fi | |
67 | ]) | |
68 | - LDFLAGS="$LDFLAGS_save" | |
69 | + LIBS="$LIBS_save" | |
70 | if test "$ac_cv_lib_kerberos4" != "no"; then | |
71 | AC_DEFINE(HAVE_KRB4,1,[Define if you have Krb4]) | |
72 | msg_krb4="yes" | |
b345ddbe MB |
73 | diff -urN evolution-2.22.3.1/plugins/exchange-operations/Makefile.am evolution-2.22.3.1.new/plugins/exchange-operations/Makefile.am |
74 | --- evolution-2.22.3.1/plugins/exchange-operations/Makefile.am 2008-04-04 11:11:25.000000000 +0200 | |
75 | +++ evolution-2.22.3.1.new/plugins/exchange-operations/Makefile.am 2008-07-01 11:00:03.105224585 +0200 | |
76 | @@ -54,6 +54,7 @@ | |
77 | $(top_builddir)/calendar/gui/libevolution-calendar.la \ | |
78 | $(top_builddir)/mail/libevolution-mail.la \ | |
79 | $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ | |
80 | + $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ | |
81 | $(CAMEL_EXCHANGE_LIBS) | |
82 | ||
83 | liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) |