3 files changed, 10 insertions, 5 deletions
diff --git a/camel/providers/mbox/Makefile.am b/camel/providers/mbox/Makefile.am
index 62cfeaba22..eca7233ae3 100644
--- a/camel/providers/mbox/Makefile.am
+++ b/camel/providers/mbox/Makefile.am
@@ -4,9 +4,10 @@ SUBDIRS =
 
 libcamelmboxincludedir = $(includedir)/camel
 
-lib_LTLIBRARIES = libcamelmbox.la
 
-#provider_LTLIBRARIES = libcamelmbox.la
+providerdir = $(pkglibdir)/camel-providers/$(VERSION)
+
+provider_LTLIBRARIES = libcamelmbox.la
 
 INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir)	\
 	-I$(top_srcdir)/intl			\
@@ -34,6 +35,7 @@ libcamelmboxinclude_HEADERS =			\
 libcamelmbox_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
 
 #libcamelmbox_la_LIBADD = -L$(top_srcdir)/libibex -libex
-libcamelmbox_la_LIBADD = $(top_srcdir)/libibex/libibex.la $(UNICODE_LIBS)
+#libcamelmbox_la_LIBADD = $(top_srcdir)/libibex/libibex.la $(UNICODE_LIBS)
+libcamelmbox_la_LIBADD =  -L$(top_srcdir)/libibex -libex $(UNICODE_LIBS)
 
 EXTRA_DIST = 
diff --git a/camel/providers/mbox/camel-mbox-provider.c b/camel/providers/mbox/camel-mbox-provider.c
index 873dca0954..a63d832d5d 100644
--- a/camel/providers/mbox/camel-mbox-provider.c
+++ b/camel/providers/mbox/camel-mbox-provider.c
@@ -39,7 +39,11 @@ static CamelProvider _mbox_provider = {
 };
 
 CamelProvider *
-camel_provider_module_init ()
+camel_provider_module_init (void);
+
+
+CamelProvider *
+camel_provider_module_init (void)
 {
 	_mbox_provider.object_type = camel_mbox_store_get_type();
 	return &_mbox_provider;
diff --git a/camel/providers/mbox/camel-mbox-store.c b/camel/providers/mbox/camel-mbox-store.c
index f8b3b62718..12923b1b5a 100644
--- a/camel/providers/mbox/camel-mbox-store.c
+++ b/camel/providers/mbox/camel-mbox-store.c
@@ -54,7 +54,6 @@ camel_mbox_store_class_init (CamelMboxStoreClass *camel_mbox_store_class)
 static void
 camel_mbox_store_init (gpointer object, gpointer klass)
 {
-	CamelMboxStore *mbox_store = CAMEL_MBOX_STORE (object);
 	CamelStore *store = CAMEL_STORE (object);
 	
 	store->separator = '/';