only use major and minor version in the camel providerdir, not micro and nano

svn path=/trunk/; revision=15121

9 files changed, 36 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index ea5539987f..5731feadb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-17  Dan Winship  <danw@ximian.com>
+
+	* configure.in (camel_providerdir): Define this here, using only
+	EVOLUTION_MAJOR_VERSION and EVOLUTION_MINOR_VERSION (and not MICRO
+	and NANO).
+
 2001-12-13  Chris Toshok  <toshok@ximian.com>
 
 	* configure.in: check for alloca.h.
diff --git a/camel/ChangeLog b/camel/ChangeLog
index c3c40749ad..cb8a9eaf6a 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,19 @@
+2001-12-17  Dan Winship  <danw@ximian.com>
+
+	* Makefile.am (INCLUDES): define CAMEL_PROVIDERDIR to be the
+	configure.in-defined camel_providerdir.
+
+	* providers/Makefile.am: Remove some outdated comments
+
+	* providers/imap/Makefile.am (camel_provider_LTLIBRARIES,
+	camel_provider_DATA): renamed from provider_LTLIBRARIES,
+	provider_DATA.
+	* providers/local/Makefile.am: Likewise
+	* providers/nntp/Makefile.am: Likewise
+	* providers/pop3/Makefile.am: Likewise
+	* providers/sendmail/Makefile.am: Likewise
+	* providers/smtp/Makefile.am: Likewise
+
 2001-12-16  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* providers/imap/camel-imap-folder.c (get_content): Reverted my
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 0fad241d6a..5c2075567a 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -3,7 +3,6 @@
 SUBDIRS = providers tests
 
 libcamelincludedir = $(includedir)/camel
-providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
 
 sbin_PROGRAMS =	camel-lock-helper
 
@@ -20,7 +19,7 @@ INCLUDES = -I.. -I$(srcdir)/.. 			 \
 	$(NSS_CFLAGS)				 \
 	$(OPENSSL_CFLAGS)			 \
 	-DCAMEL_SBINDIR=\""$(sbindir)"\"	 \
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
+	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
 	-DG_LOG_DOMAIN=\"camel\"
 
 libcamel_la_SOURCES = 				\
diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am
index 5fd7c83e50..5a0df08299 100644
--- a/camel/providers/Makefile.am
+++ b/camel/providers/Makefile.am
@@ -4,8 +4,4 @@ if ENABLE_NNTP
 NNTP_DIR=nntp
 endif
 
-# SUBDIRS = mbox pop3 sendmail smtp vee
 SUBDIRS = pop3 sendmail smtp imap $(NNTP_DIR) local
-
-# these ones are deprecated, and will no longer be maintained
-# mbox mh maildir vee
\ No newline at end of file
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index 65325cf9bf..bf183aa3ce 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -2,11 +2,8 @@
 
 libcamelimapincludedir = $(includedir)/camel
 
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelimap.la
-provider_DATA = libcamelimap.urls
+camel_provider_LTLIBRARIES = libcamelimap.la
+camel_provider_DATA = libcamelimap.urls
 
 INCLUDES = -I.. \
 	-I$(srcdir)/..				\
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index 22a284dd9f..f0ad0c7f6c 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -2,10 +2,8 @@
 
 libcamellocalincludedir = $(includedir)/camel
 
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamellocal.la
-provider_DATA = libcamellocal.urls
+camel_provider_LTLIBRARIES = libcamellocal.la
+camel_provider_DATA = libcamellocal.urls
 
 INCLUDES = -I.. \
 	-I$(srcdir)/..				\
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 7279c40be8..4605be64c8 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -2,10 +2,8 @@
 
 libcamelnntpincludedir = $(includedir)/camel
 
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelnntp.la
-provider_DATA = libcamelnntp.urls
+camel_provider_LTLIBRARIES = libcamelnntp.la
+camel_provider_DATA = libcamelnntp.urls
 
 INCLUDES = -I../..				\
 	-I$(top_srcdir)/camel			\
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index d5225c3ef9..cde7baf25a 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -2,10 +2,8 @@
 
 libcamelpop3includedir = $(includedir)/camel
 
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelpop3.la
-provider_DATA = libcamelpop3.urls
+camel_provider_LTLIBRARIES = libcamelpop3.la
+camel_provider_DATA = libcamelpop3.urls
 
 INCLUDES =					\
 	-I..					\
diff --git a/configure.in b/configure.in
index a4abf735e6..cb5f9d1a1c 100644
--- a/configure.in
+++ b/configure.in
@@ -648,6 +648,9 @@ CAMEL_LIBS="`gnome-config --libs gal xml` $THREADS_LIBS"
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
 
+camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION
+AC_SUBST(camel_providerdir)
+
 MAILER_CFLAGS="`gnome-config --cflags gtkhtml libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal bonobo_conf bonobox bonobox_print vfs oaf` $THREADS_CFLAGS"
 MAILER_LIBS="`gnome-config --libs gtkhtml libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal bonobo_conf bonobox bonobox_print vfs oaf` $THREADS_LIBS"
 AC_SUBST(MAILER_CFLAGS)
@@ -767,7 +770,8 @@ if test x${with_krb4:=no} != xno; then
 		msg_krb4=yes
 		if test -f "$with_krb4/include/krb.h" -o -f "$with_krb4/include/port-sockets.h"; then
 			KRB4_CFLAGS="-I$with_krb4/include"
-		else
+		fi
+		if test -d "$with_krb4/include/kerberosIV"; then
 			KRB4_CFLAGS="-I$with_krb4/include/kerberosIV"
 		fi
 		KRB4_LDFLAGS="-L$with_krb4/lib $ac_cv_lib_kerberos4"