# HG changeset patch # User Timo Sirainen # Date 1296424634 -7200 # Node ID 816a6e69d4b5e7ebc51440e9d11c95c15172f5c1 # Parent f57d19f262a5be8a6f49806fc14bd3528e23380c dovecot-config, dovecot.m4: Export SQL_LIBS as DOVECOT_SQL_LIBS diff -r f57d19f262a5 -r 816a6e69d4b5 dovecot-config.in.in --- a/dovecot-config.in.in Sun Jan 30 23:56:23 2011 +0200 +++ b/dovecot-config.in.in Sun Jan 30 23:57:14 2011 +0200 @@ -1,6 +1,7 @@ DOVECOT_CFLAGS="@CFLAGS@" DOVECOT_LIBS="@LIBS@" DOVECOT_SSL_LIBS="@SSL_LIBS@" +DOVECOT_SQL_LIBS="@SQL_LIBS@" LIBDOVECOT="@LIBDOVECOT@ @MODULE_LIBS@" LIBDOVECOT_LOGIN="@LIBDOVECOT_LOGIN@ @SSL_LIBS@" diff -r f57d19f262a5 -r 816a6e69d4b5 dovecot.m4 --- a/dovecot.m4 Sun Jan 30 23:56:23 2011 +0200 +++ b/dovecot.m4 Sun Jan 30 23:57:14 2011 +0200 @@ -6,7 +6,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 3 +# serial 4 AC_DEFUN([DC_DOVECOT_MODULEDIR],[ AC_ARG_WITH(moduledir, @@ -56,10 +56,10 @@ AC_MSG_ERROR([dovecot-config not found]) fi - eval `grep -i '^dovecot_[[a-z]]*=' "$dovecotdir"/dovecot-config` + eval `grep -i '^dovecot_[[a-z_]]*=' "$dovecotdir"/dovecot-config` eval `grep '^LIBDOVECOT[[A-Z_]]*=' "$dovecotdir"/dovecot-config` AX_SUBST_L([dovecotdir], [dovecot_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir]) - AX_SUBST_L([DOVECOT_CFLAGS], [DOVECOT_LIBS], [DOVECOT_SSL_LIBS]) + AX_SUBST_L([DOVECOT_CFLAGS], [DOVECOT_LIBS], [DOVECOT_SSL_LIBS], [DOVECOT_SQL_LIBS]) AX_SUBST_L([LIBDOVECOT], [LIBDOVECOT_LOGIN], [LIBDOVECOT_SQL], [LIBDOVECOT_LDA], [LIBDOVECOT_STORAGE]) AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_LDA_DEPS], [LIBDOVECOT_STORAGE_DEPS]) AX_SUBST_L([LIBDOVECOT_INCLUDE], [LIBDOVECOT_LDA_INCLUDE], [LIBDOVECOT_SERVICE_INCLUDE], [LIBDOVECOT_STORAGE_INCLUDE], [LIBDOVECOT_LOGIN_INCLUDE], [LIBDOVECOT_CONFIG_INCLUDE])