]>
Commit | Line | Data |
---|---|---|
330e25a3 | 1 | diff -urN aaa/evolution-data-server-1.7.91/configure.in evolution-data-server-1.7.91/configure.in |
2 | --- aaa/evolution-data-server-1.7.91/configure.in 2006-08-07 19:04:24.000000000 +0200 | |
3 | +++ evolution-data-server-1.7.91/configure.in 2006-08-13 23:43:09.773575500 +0200 | |
4 | @@ -561,7 +561,7 @@ | |
5 | AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs, | |
6 | [ | |
7 | LIBS_save="$LIBS" | |
8 | - LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" | |
9 | + LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs" | |
10 | LIBS="$nsslibs $nsprlibs" | |
11 | AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no") | |
12 | if test "$moz_nss_libs" = no; then | |
13 | @@ -950,17 +950,21 @@ | |
14 | msg_krb5="no" | |
15 | if test "x${with_krb5}" != "xno"; then | |
16 | LDFLAGS_save="$LDFLAGS" | |
17 | + LIBS_save="$LIBS" | |
18 | ||
19 | mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" | |
20 | heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" | |
21 | AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5, | |
22 | [ | |
23 | - LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs" | |
24 | + LIBS="$LIBS $mitlibs" | |
25 | + LDFLAGS="$LDFLAGS -L$with_krb5_libs" | |
26 | AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs", | |
27 | [ | |
28 | - LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs" | |
29 | + LIBS="$LIBS_save $heimlibs" | |
30 | + LDFLAGS="$LDFLAGS_save -L$with_krb5_libs" | |
31 | AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no") | |
32 | ]) | |
33 | + LIBS="$LIBS_save" | |
34 | LDFLAGS="$LDFLAGS_save" | |
35 | ]) | |
36 | if test "$ac_cv_lib_kerberos5" != "no"; then | |
37 | @@ -995,6 +999,7 @@ | |
38 | ||
39 | msg_krb4="no" | |
40 | if test "x${with_krb4}" != "xno"; then | |
41 | + LIBS_save="$LIBS" | |
42 | LDFLAGS_save="$LDFLAGS" | |
43 | AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4, | |
44 | [ | |
45 | @@ -1002,24 +1007,28 @@ | |
46 | ||
47 | mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err" | |
48 | # Look for MIT krb5 compat krb4 | |
49 | - LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs" | |
50 | + LIBS="$LIBS $mitcompatlibs" | |
51 | + LDFLAGS="$LDFLAGS -L$with_krb4_libs" | |
52 | AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="$mitcompatlibs") | |
53 | ||
54 | if test "$ac_cv_lib_kerberos4" = "no"; then | |
55 | # Look for KTH krb4 | |
56 | - LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken" | |
57 | + LIBS="$LIBS_save -lkrb -lcrypto -lcom_err -lroken" | |
58 | + LDFLAGS="$LDFLAGS_save -L$with_krb4_libs" | |
59 | AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken") | |
60 | fi | |
61 | if test "$ac_cv_lib_kerberos4" = "no"; then | |
62 | # Look for old MIT krb4 | |
63 | - LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb" | |
64 | + LIBS="$LIBS_save -lkrb" | |
65 | + LDFLAGS="$LDFLAGS_save -L$with_krb4_libs" | |
66 | AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb", | |
67 | [ | |
68 | - LDFLAGS="$LDFLAGS -ldes" | |
69 | + LIBS="$LIBS -ldes" | |
70 | AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -ldes") | |
71 | ]) | |
72 | fi | |
73 | ]) | |
74 | + LIBS="$LIBS_save" | |
75 | LDFLAGS="$LDFLAGS_save" | |
76 | if test "$ac_cv_lib_kerberos4" != "no"; then | |
77 | AC_DEFINE(HAVE_KRB4,1,[Define if you have Krb4]) |