cvill64
365fd02a3a
git-svn-id: http://svn.sabayonlinux.org/overlay@433 d7aec97c-591d-0410-af39-a8856400b30a
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.3.orig/configure.in evolution-data-server-1.7.3/configure.in
|
|
--- evolution-data-server-1.7.3.orig/configure.in 2006-06-12 10:27:29.000000000 -0400
|
|
+++ evolution-data-server-1.7.3/configure.in 2006-07-07 10:22:49.000000000 -0400
|
|
@@ -950,19 +950,23 @@
|
|
msg_krb5="no"
|
|
if test "x${with_krb5}" != "xno"; then
|
|
LDFLAGS_save="$LDFLAGS"
|
|
+ SAVE_LIBS="$LIBS"
|
|
|
|
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
|
|
heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
|
|
AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
|
|
[
|
|
- LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
|
|
+ LDFLAGS="$LDFLAGS -L$with_krb5_libs"
|
|
+ LIBS="$SAVE_LIBS $mitlibs"
|
|
AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
|
|
[
|
|
- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
|
|
+ LDFLAGS="$LDFLAGS_save -L$with_krb5_libs"
|
|
+ LIBS="$SAVE_LIBS $heimlibs"
|
|
AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
|
|
])
|
|
- LDFLAGS="$LDFLAGS_save"
|
|
])
|
|
+ LDFLAGS="$LDFLAGS_save"
|
|
+ LIBS="$SAVE_LIBS"
|
|
if test "$ac_cv_lib_kerberos5" != "no"; then
|
|
AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5])
|
|
if test "$ac_cv_lib_kerberos5" = "$mitlibs"; then
|