Fix distcheck errors.

diff --git a/Makefile.am b/Makefile.am
index d90fbe6..bcdd321 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS=-I m4
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-krb5=/usr
 
 if ENABLE_CALENDAR
 CALENDAR_DIR = calendar

diff --git a/camel/tests/lib/messages.c b/camel/tests/lib/messages.c
index a6cbee0..de6bf8c 100644 (file)
--- a/camel/tests/lib/messages.c
+++ b/camel/tests/lib/messages.c
@@ -32,9 +32,10 @@ test_message_create_simple(void)
 }
 
 static void
-content_finalize(CamelObject *folder, gpointer crap, gpointer ba)
+content_weak_notify (GByteArray *ba,
+                     GObject *where_the_object_was)
 {
-       g_byte_array_free(ba, TRUE);
+       g_byte_array_free (ba, TRUE);
 }
 
 void
@@ -69,7 +70,9 @@ test_message_set_content_simple(CamelMimePart *part, gint how, const gchar *type
                content = (CamelStreamMem *)camel_stream_mem_new();
                camel_stream_mem_set_byte_array(content, ba);
 
-               camel_object_hook_event((CamelObject *)content, "finalize", content_finalize, ba);
+               g_object_weak_ref (
+                       G_OBJECT (content), (GWeakNotify)
+                       content_weak_notify, ba);
                break;
        }
 

diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am
index 5ba4836..989400a 100644 (file)
--- a/docs/reference/camel/Makefile.am
+++ b/docs/reference/camel/Makefile.am
@@ -24,12 +24,12 @@ GTKDOC_CFLAGS =             \
        -I$(top_srcdir)         \
        -I$(top_builddir)       \
        -I$(top_builddir)/camel \
-       $(GLIB_CFLAGS)
+       $(CAMEL_CFLAGS)
 
 GTKDOC_LIBS =                                          \
        $(top_builddir)/camel/libcamel-1.2.la           \
        $(top_builddir)/camel/libcamel-provider-1.2.la  \
-       $(GLIB_LIBS)
+       $(CAMEL_LIBS)
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =                        \