Thanks, I've
get the ChangeLog modified.
The attached is the updated patch.
Cheers.
Irene Huang
Sarfraaz Ahmed wrote:
Thanks for the patch. Please include a
ChangeLog file and commit it
*only* to the HEAD.
-- Sarfraaz
On Thu, 2005-09-15 at 18:10 +0800, Shiying Irene Huang wrote:
Hi, Connector maintainers
In the attached patch, configuration items regarding kerberos 5 are
removed to ensure successful compilation of evolution-exchange.
Please review.
Thanks
Irene Huang
_______________________________________________
Evolution-patches mailing list
Evolution-patches gnome org
http://mail.gnome.org/mailman/listinfo/evolution-patches
_______________________________________________
Evolution-patches mailing list
Evolution-patches gnome org
http://mail.gnome.org/mailman/listinfo/evolution-patches
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.395.2.5
diff -u -r1.395.2.5 ChangeLog
--- ChangeLog 13 Sep 2005 14:26:19 -0000 1.395.2.5
+++ ChangeLog 15 Sep 2005 12:22:45 -0000
@@ -1,3 +1,10 @@
+2005-09-15 Irene Huang <Irene Huang sun com>
+
+ * camel/Makefile.am: Removed KRB5_LIBS from libcamelexchange_la_LIBADD.
+ * configure.in: Removed the Kerberos section for KRB5 configurations.
+ * docs/reference/Makefile.am: Removed KRB5_LIBS from GTKDOC_LIBS.
+ * storage/Makefile.am: Remove KRB5_CFLAGS from -DG_LOG_DOMAIN, KRB5_LIBS from evolution_exchange_storage_LDADD, ximian_connector_setup_LDADD and migr_test_LDADD.
+
2005-09-13 Roozbeh Pournader <roozbeh farsiweb info>
* configure.in: Added 'fa' (Persian) to ALL_LINGUAS.
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-exchange/configure.in,v
retrieving revision 1.85.2.1
diff -u -r1.85.2.1 configure.in
--- configure.in 6 Sep 2005 14:33:22 -0000 1.85.2.1
+++ configure.in 15 Sep 2005 12:22:45 -0000
@@ -195,51 +195,6 @@
CFLAGS="$SAVE_CFLAGS"
LIBS="$SAVE_LIBS"
-dnl ********
-dnl Kerberos
-dnl ********
-AC_ARG_WITH(krb5, [ --with-krb5=DIR Location of Kerberos 5 installation], with_krb5="$withval", with_krb5="/usr")
-AC_ARG_WITH(krb5-libs, [ --with-krb5-libs=DIR Location of Kerberos 5 libraries], with_krb5_libs="$withval", with_krb5_libs="$with_krb5/lib")
-AC_ARG_WITH(krb5-includes, [ --with-krb5-includes=DIR Location of Kerberos 5 headers], with_krb5_includes="$withval", with_krb5_includes="")
-
-
-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_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
- AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
- [
- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
- AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
- ])
- LDFLAGS="$LDFLAGS_save"
-])
-if test "$ac_cv_lib_kerberos5" = "no"; then
- AC_MSG_ERROR(Could not find krb5. Install krb5 or heimdal packages.)
-fi
-
-if test "$ac_cv_lib_kerberos5" = "$mitlibs"; then
- AC_DEFINE(HAVE_MIT_KRB5,1,[Define if you have MIT Krb5])
- if test -z "$with_krb5_includes"; then
- KRB5_CFLAGS="-I$with_krb5/include"
- else
- KRB5_CFLAGS="-I$with_krb5_includes"
- fi
- else
- AC_DEFINE(HAVE_HEIMDAL_KRB5,1,[Define if you have Heimdal])
- if test -z "$with_krb5_includes"; then
- KRB5_CFLAGS="-I$with_krb5/include/heimdal"
- else
- KRB5_CFLAGS="-I$with_krb5_includes"
- fi
- fi
-
-KRB5_LIBS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
-AC_SUBST(KRB5_CFLAGS)
-AC_SUBST(KRB5_LIBS)
-
dnl *******
dnl gtk-doc
Index: camel/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-exchange/camel/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- camel/Makefile.am 10 Jun 2005 11:35:33 -0000 1.8
+++ camel/Makefile.am 15 Sep 2005 12:22:46 -0000
@@ -39,7 +39,6 @@
libcamelexchange_la_LIBADD = \
$(LDAP_LIBS) \
$(LIBEXCHANGE_LIBS) \
- $(EXCHANGE_STORAGE_LIBS) \
- $(KRB5_LIBS)
+ $(EXCHANGE_STORAGE_LIBS)
EXTRA_DIST = libcamelexchange.urls
Index: docs/reference/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-exchange/docs/reference/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- docs/reference/Makefile.am 2 Jul 2005 07:38:16 -0000 1.6
+++ docs/reference/Makefile.am 15 Sep 2005 12:22:46 -0000
@@ -43,7 +43,6 @@
GTKDOC_LIBS = \
$(LIBEXCHANGE_LIBS) \
- $(KRB5_LIBS) \
$(LDAP_LIBS)
# Extra options to supply to gtkdoc-mkdb
Index: storage/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- storage/Makefile.am 19 Aug 2005 16:32:20 -0000 1.21
+++ storage/Makefile.am 15 Sep 2005 12:23:06 -0000
@@ -2,7 +2,6 @@
-DG_LOG_DOMAIN=\"evolution-exchange-storage\" \
$(LIBEXCHANGE_CFLAGS) \
$(EXCHANGE_STORAGE_CFLAGS) \
- $(KRB5_CFLAGS) \
$(LDAP_CFLAGS) \
-DPREFIX=\"$(prefix)\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -53,8 +52,7 @@
$(top_builddir)/camel/camel-stub-marshal.lo \
$(LDAP_LIBS) \
$(EXCHANGE_STORAGE_LIBS) \
- $(LIBEXCHANGE_LIBS) \
- $(KRB5_LIBS)
+ $(LIBEXCHANGE_LIBS)
ximian_connector_setup_SOURCES = \
@@ -68,8 +66,7 @@
ximian_connector_setup_LDADD = \
$(LDAP_LIBS) \
$(EXCHANGE_STORAGE_LIBS) \
- $(LIBEXCHANGE_LIBS) \
- $(KRB5_LIBS)
+ $(LIBEXCHANGE_LIBS)
install-exec-local: ximian-connector-setup
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -87,8 +84,7 @@
migr_test_LDADD = \
$(LDAP_LIBS) \
$(EXCHANGE_STORAGE_LIBS) \
- $(LIBEXCHANGE_LIBS) \
- $(KRB5_LIBS)
+ $(LIBEXCHANGE_LIBS)
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_Evolution_Exchange_Storage.server.in.in
_______________________________________________
Evolution-patches mailing list
Evolution-patches gnome org
http://mail.gnome.org/mailman/listinfo/evolution-patches
