Use -avoid-version instead of -version-info 0:0:0, and specify -module.

	* providers/imap/Makefile.am (libcamelimap_la_LDFLAGS): Use
	-avoid-version instead of -version-info 0:0:0, and specify
	-module. (From Max Horn <max@quendi.de>).

	* providers/local/Makefile.am (libcamellocal_la_LDFLAGS): Likewise.

	* providers/nntp/Makefile.am (libcamelnntp_la_LDFLAGS): Likewise.

	* providers/sendmail/Makefile.am (libcamelsendmail_la_LDFLAGS):
	Likewise.

	* providers/smtp/Makefile.am (libcamelsmtp_la_LDFLAGS): Likewise.

	* providers/pop3/Makefile.am (libcamelpop3_la_LDFLAGS): Likewise.
	Also remove $(KRB4_LDFLAGS) since KPOP is gone.
	(INCLUDES): and $(KRB4_CFLAGS)

svn path=/trunk/; revision=16305

6 files changed, 6 insertions, 7 deletions

diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index bf183aa3ce..9f9d186e46 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -40,7 +40,7 @@ libcamelimapinclude_HEADERS =			\
 	camel-imap-utils.h			\
 	camel-imap-wrapper.h
 
-libcamelimap_la_LDFLAGS = -version-info 0:0:0
+libcamelimap_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS =				\
 	camel-imap-private.h
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index b0f033cf66..d619a0b169 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -58,7 +58,7 @@ libcamellocalinclude_HEADERS =			\
 noinst_HEADERS =				\
 	camel-local-private.h
 
-libcamellocal_la_LDFLAGS = -version-info 0:0:0
+libcamellocal_la_LDFLAGS = -avoid-version -module
 
 libcamellocal_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la
 
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 4605be64c8..34c4e6aa7f 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -48,6 +48,6 @@ libcamelnntpinclude_HEADERS =			\
 noinst_HEADERS =				\
 	camel-nntp-private.h
 
-libcamelnntp_la_LDFLAGS = -version-info 0:0:0
+libcamelnntp_la_LDFLAGS = -avoid-version -module
 
 EXTRA_DIST = libcamelnntp.urls
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index 4ce92eac2d..9e94c5c89a 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -15,7 +15,6 @@ INCLUDES =					\
 	-I$(top_srcdir)/e-util			\
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
-	$(KRB4_CFLAGS)				\
 	$(GTK_INCLUDEDIR)			\
 	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
 
@@ -33,7 +32,7 @@ libcamelpop3include_HEADERS =			\
 	camel-pop3-store.h
 
 
-libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
+libcamelpop3_la_LDFLAGS = -avoid-version -module
 
 libcamelpop3_la_LIBADD = $(top_builddir)/e-util/libeutil.la
 
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index a6aeb09bf2..57834b9853 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -24,6 +24,6 @@ libcamelsendmail_la_SOURCES = 			\
 libcamelsendmailinclude_HEADERS =		\
 	camel-sendmail-transport.h
 
-libcamelsendmail_la_LDFLAGS = -version-info 0:0:0
+libcamelsendmail_la_LDFLAGS = -avoid-version -module
 
 EXTRA_DIST = libcamelsendmail.urls
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index 8bc666f1aa..f70f19e56a 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -29,7 +29,7 @@ libcamelsmtpinclude_HEADERS =			\
 	camel-smtp-transport.h
 
 
-libcamelsmtp_la_LDFLAGS = -version-info 0:0:0
+libcamelsmtp_la_LDFLAGS = -avoid-version -module
 
 libcamelsmtp_la_LIBADD = $(top_builddir)/e-util/libeutil.la