dovecot-2.1: lib-sql: Don't link sql libraries to libdovecot-sql...

dovecot at dovecot.org dovecot at dovecot.org
Sat Sep 3 12:05:09 EEST 2011


details:   http://hg.dovecot.org/dovecot-2.1/rev/d2b27eae9221
changeset: 13370:d2b27eae9221
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Sep 03 12:04:56 2011 +0300
description:
lib-sql: Don't link sql libraries to libdovecot-sql.so when building them as plugins.

diffstat:

 src/lib-sql/Makefile.am |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (27 lines):

diff -r 338ba56340c0 -r d2b27eae9221 src/lib-sql/Makefile.am
--- a/src/lib-sql/Makefile.am	Fri Sep 02 07:11:16 2011 +0300
+++ b/src/lib-sql/Makefile.am	Sat Sep 03 12:04:56 2011 +0300
@@ -68,15 +68,18 @@
 libdriver_sqlite_la_LIBADD = $(SQLITE_LIBS)
 libdriver_sqlite_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(SQLITE_CFLAGS)
 libdriver_sqlite_la_SOURCES = driver-sqlite.c
+
+sql_libs =
+else
+sql_libs = \
+	$(MYSQL_LIBS) \
+	$(PGSQL_LIBS) \
+	$(SQLITE_LIBS)
 endif
 
 pkglib_LTLIBRARIES = libdovecot-sql.la
 libdovecot_sql_la_SOURCES = 
-libdovecot_sql_la_LIBADD = libsql.la $(deplibs) \
-	$(MYSQL_LIBS) \
-	$(PGSQL_LIBS) \
-	$(SQLITE_LIBS) \
-	$(MODULE_LIBS)
+libdovecot_sql_la_LIBADD = libsql.la $(deplibs) $(MODULE_LIBS) $(sql_libs)
 libdovecot_sql_la_DEPENDENCIES = libsql.la
 libdovecot_sql_la_LDFLAGS = -export-dynamic
 


More information about the dovecot-cvs mailing list