From: Aki Tuomi Date: Tue, 20 Aug 2024 06:47:49 +0000 (+0300) Subject: global: Include lib-var-expand where needed X-Git-Tag: 2.4.0~339 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90bb91147606a7c5f68757f364ec52e2db91c86f;p=thirdparty%2Fdovecot%2Fcore.git global: Include lib-var-expand where needed --- diff --git a/dovecot-config.in.in b/dovecot-config.in.in index c8351eed1a..c74ecafad4 100644 --- a/dovecot-config.in.in +++ b/dovecot-config.in.in @@ -33,7 +33,7 @@ LIBDOVECOT_LIBLANG_DEPS="@LIBDOVECOT_LIBLANG@" LIBDOVECOT_LUA_DEPS="@LIBDOVECOT_LUA@" LIBDOVECOT_OPENSSL_DEPS="@LIBDOVECOT_OPENSSL@" -LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-json -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-smtp -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-auth-client -I$(incdir)/src/lib-login -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client -I$(incdir)/src/lib-oauth2" +LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-json -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-smtp -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-auth-client -I$(incdir)/src/lib-login -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client -I$(incdir)/src/lib-oauth2 -I$(incdir)/src/lib-var-expand" LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda" LIBDOVECOT_AUTH_INCLUDE="-I$(incdir)/src/auth" LIBDOVECOT_DOVEADM_INCLUDE="-I$(incdir)/src/lib-doveadm -I$(incdir)/src/doveadm" diff --git a/src/anvil/Makefile.am b/src/anvil/Makefile.am index 01369987b7..54d5b1db05 100644 --- a/src/anvil/Makefile.am +++ b/src/anvil/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-test \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-master \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) anvil_LDADD = \ diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index 2a672d08b9..e758591ff8 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -52,6 +52,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-ssl-iostream \ -I$(top_srcdir)/src/lib-lua \ -I$(top_srcdir)/src/lib-dcrypt \ + -I$(top_srcdir)/src/lib-var-expand \ -DAUTH_MODULE_DIR=\""$(auth_moduledir)"\" \ -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \ -DPKG_RUNDIR=\""$(rundir)"\" \ diff --git a/src/config/Makefile.am b/src/config/Makefile.am index 5f0cf3772b..cd5a4c4b77 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -16,6 +16,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-pop3 \ -I$(top_srcdir)/src/imap-urlauth \ -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand \ -DPKG_RUNDIR=\""$(rundir)"\" \ -DPKG_STATEDIR=\""$(statedir)"\" \ -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \ diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am index 6bb01b1973..70316d22c0 100644 --- a/src/dict/Makefile.am +++ b/src/dict/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-dict \ -I$(top_srcdir)/src/lib-dict-extra \ -I$(top_srcdir)/src/lib-sql \ + -I$(top_srcdir)/src/lib-var-expand \ -DDICT_MODULE_DIR=\""$(moduledir)/dict"\" \ -DPKG_RUNDIR=\""$(rundir)"\" \ $(BINARY_CFLAGS) diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 87f4b6cdf1..c73a151989 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) dns_client_LDADD = $(LIBDOVECOT) \ diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am index 21fc450630..63c2d6c28b 100644 --- a/src/doveadm/Makefile.am +++ b/src/doveadm/Makefile.am @@ -29,6 +29,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-dcrypt \ -I$(top_srcdir)/src/lib-sasl \ -I$(top_srcdir)/src/stats \ + -I$(top_srcdir)/src/lib-var-expand \ -DMODULEDIR=\""$(moduledir)"\" \ -DAUTH_MODULE_DIR=\""$(moduledir)/auth"\" \ -DDOVEADM_MODULEDIR=\""$(doveadm_moduledir)"\" \ diff --git a/src/doveadm/dsync/Makefile.am b/src/doveadm/dsync/Makefile.am index e696b8d342..3e65e88f28 100644 --- a/src/doveadm/dsync/Makefile.am +++ b/src/doveadm/dsync/Makefile.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ - -I$(top_srcdir)/src/lib-storage + -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand libdsync_la_SOURCES = \ dsync-brain.c \ diff --git a/src/imap-hibernate/Makefile.am b/src/imap-hibernate/Makefile.am index 3641c90e13..17aa7074ab 100644 --- a/src/imap-hibernate/Makefile.am +++ b/src/imap-hibernate/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-imap \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) imap_hibernate_LDADD = $(LIBDOVECOT) \ diff --git a/src/imap-login/Makefile.am b/src/imap-login/Makefile.am index d58e3d062b..b0a240ff4f 100644 --- a/src/imap-login/Makefile.am +++ b/src/imap-login/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-login \ -I$(top_srcdir)/src/lib-mail \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/login-common \ $(BINARY_CFLAGS) diff --git a/src/imap-urlauth-login/Makefile.am b/src/imap-urlauth-login/Makefile.am index d0c0d977d5..d44e24c488 100644 --- a/src/imap-urlauth-login/Makefile.am +++ b/src/imap-urlauth-login/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-auth-client \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-login \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) imap_urlauth_login_CPPFLAGS = \ diff --git a/src/imap-urlauth/Makefile.am b/src/imap-urlauth/Makefile.am index 168eba679e..0b38db2ea9 100644 --- a/src/imap-urlauth/Makefile.am +++ b/src/imap-urlauth/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-auth-client \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-login \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) # imap-urlauth diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am index fbc70aeff0..be2afe57f0 100644 --- a/src/imap/Makefile.am +++ b/src/imap/Makefile.am @@ -17,6 +17,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-compression \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) imap_LDFLAGS = -export-dynamic \ diff --git a/src/indexer/Makefile.am b/src/indexer/Makefile.am index d455ea6b20..cd264320da 100644 --- a/src/indexer/Makefile.am +++ b/src/indexer/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-language \ + -I$(top_srcdir)/src/lib-var-expand \ -DPKG_RUNDIR=\""$(rundir)"\" \ $(BINARY_CFLAGS) diff --git a/src/lda/Makefile.am b/src/lda/Makefile.am index eb1807972b..c7b3fe3045 100644 --- a/src/lda/Makefile.am +++ b/src/lda/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-smtp \ -I$(top_srcdir)/src/lib-lda \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ -I$(top_srcdir)/src/lib-storage/index/raw \ diff --git a/src/lib-auth-client/Makefile.am b/src/lib-auth-client/Makefile.am index ffdebeea3c..90374e53c7 100644 --- a/src/lib-auth-client/Makefile.am +++ b/src/lib-auth-client/Makefile.am @@ -4,7 +4,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-settings \ - -I$(top_srcdir)/src/lib-test + -I$(top_srcdir)/src/lib-test \ + -I$(top_srcdir)/src/lib-var-expand libauth_client_la_SOURCES = \ auth-client.c \ @@ -32,6 +33,7 @@ noinst_PROGRAMS = $(test_programs) test_libs = \ $(noinst_LTLIBRARIES) \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la \ $(MODULE_LIBS) @@ -39,6 +41,7 @@ test_libs = \ test_deps = \ $(noinst_LTLIBRARIES) \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la diff --git a/src/lib-compression/Makefile.am b/src/lib-compression/Makefile.am index 82ee849089..87413cf50f 100644 --- a/src/lib-compression/Makefile.am +++ b/src/lib-compression/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-test \ -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand \ $(ZSTD_CFLAGS) libcompression_la_SOURCES = \ @@ -44,6 +45,7 @@ noinst_PROGRAMS = $(test_programs) bench-compression test_libs = \ $(noinst_LTLIBRARIES) \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la test_deps = $(test_libs) diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am index 87b9167f3c..e7016aeb76 100644 --- a/src/lib-dcrypt/Makefile.am +++ b/src/lib-dcrypt/Makefile.am @@ -58,6 +58,7 @@ check-local: done LIBDOVECOT_TEST_DEPS = \ + ../lib-var-expand/libvar_expand.la \ ../lib-ssl-iostream/libssl_iostream.la \ ../lib-json/libjson.la \ ../lib-settings/libsettings.la \ @@ -70,7 +71,7 @@ LIBDOVECOT_TEST = \ test_crypto_LDADD = $(LIBDOVECOT_TEST) test_crypto_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS) if HAVE_WHOLE_ARCHIVE -test_crypto_LDFLAGS = -export-dynamic -Wl,$(LD_WHOLE_ARCHIVE),../lib/.libs/liblib.a,../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE) +test_crypto_LDFLAGS = -export-dynamic -Wl,$(LD_WHOLE_ARCHIVE),../lib-var-expand/.libs/libvar_expand.a,../lib/.libs/liblib.a,../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE) endif test_crypto_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\" test_crypto_SOURCES = $(libdcrypt_la_SOURCES) test-crypto.c @@ -78,7 +79,7 @@ test_crypto_SOURCES = $(libdcrypt_la_SOURCES) test-crypto.c test_stream_LDADD = $(LIBDOVECOT_TEST) test_stream_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS) if HAVE_WHOLE_ARCHIVE -test_stream_LDFLAGS = -export-dynamic -Wl,$(LD_WHOLE_ARCHIVE),../lib/.libs/liblib.a,../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE) +test_stream_LDFLAGS = -export-dynamic -Wl,$(LD_WHOLE_ARCHIVE),../lib-var-expand/.libs/libvar_expand.a,../lib/.libs/liblib.a,../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE) endif test_stream_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\" test_stream_SOURCES = $(libdcrypt_la_SOURCES) test-stream.c diff --git a/src/lib-dict-backend/Makefile.am b/src/lib-dict-backend/Makefile.am index 42c7ef7cc8..2537e3b091 100644 --- a/src/lib-dict-backend/Makefile.am +++ b/src/lib-dict-backend/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-ldap \ -I$(top_srcdir)/src/lib-sql \ -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand \ $(SQL_CFLAGS) NOPLUGIN_LDFLAGS = diff --git a/src/lib-dict-extra/Makefile.am b/src/lib-dict-extra/Makefile.am index 4bc2f0bdf2..ebceda3064 100644 --- a/src/lib-dict-extra/Makefile.am +++ b/src/lib-dict-extra/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-dict \ -I$(top_srcdir)/src/lib-fs \ - -I$(top_srcdir)/src/lib-settings + -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand libdict_extra_la_SOURCES = \ dict-client.c \ @@ -32,6 +33,7 @@ test_libs = \ ../lib-test/libtest.la \ ../lib-dict/libdict.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib/liblib.la test_dict_fs_SOURCES = test-dict-fs.c diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am index 85293f5372..084b3fe96f 100644 --- a/src/lib-dict/Makefile.am +++ b/src/lib-dict/Makefile.am @@ -4,7 +4,8 @@ noinst_LTLIBRARIES = \ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-test \ - -I$(top_srcdir)/src/lib-settings + -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand base_sources = \ dict.c \ @@ -54,6 +55,7 @@ noinst_PROGRAMS = $(test_programs) test_libs = \ libdict.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la diff --git a/src/lib-fs/Makefile.am b/src/lib-fs/Makefile.am index 595c400541..bbde3d00b8 100644 --- a/src/lib-fs/Makefile.am +++ b/src/lib-fs/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-dict \ -I$(top_srcdir)/src/lib-ssl-iostream \ + -I$(top_srcdir)/src/lib-var-expand \ -DMODULE_DIR=\""$(moduledir)"\" libfs_la_SOURCES = \ @@ -51,6 +52,7 @@ test_deps = \ $(noinst_LTLIBRARIES) \ ../lib-dict/libdict.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la diff --git a/src/lib-http/Makefile.am b/src/lib-http/Makefile.am index 3a123d41b1..e5223a3b9a 100644 --- a/src/lib-http/Makefile.am +++ b/src/lib-http/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-dns \ -I$(top_srcdir)/src/lib-ssl-iostream \ -I$(top_srcdir)/src/lib-master \ + -I$(top_srcdir)/src/lib-var-expand \ -DPKG_RUNDIR=\""$(rundir)"\" libhttp_la_SOURCES = \ @@ -79,6 +80,8 @@ test_nocheck_programs = \ noinst_PROGRAMS = $(test_programs) $(test_nocheck_programs) test_libs = \ + ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la \ $(MODULE_LIBS) @@ -87,6 +90,7 @@ test_deps = \ $(noinst_LTLIBRARIES) \ ../lib-test/libtest.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib/liblib.la test_http_url_SOURCES = test-http-url.c diff --git a/src/lib-imap-client/Makefile.am b/src/lib-imap-client/Makefile.am index 24c36fba3d..b081780f0b 100644 --- a/src/lib-imap-client/Makefile.am +++ b/src/lib-imap-client/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-sasl \ -I$(top_srcdir)/src/lib-ssl-iostream \ -I$(top_srcdir)/src/lib-mail \ - -I$(top_srcdir)/src/lib-imap + -I$(top_srcdir)/src/lib-imap \ + -I$(top_srcdir)/src/lib-var-expand libimap_client_la_SOURCES = \ imapc-client.c \ @@ -43,6 +44,7 @@ test_deps = \ ../lib-otp/libotp.la \ ../lib-json/libjson.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la diff --git a/src/lib-imap-urlauth/Makefile.am b/src/lib-imap-urlauth/Makefile.am index 16e1b0cda9..5b77658691 100644 --- a/src/lib-imap-urlauth/Makefile.am +++ b/src/lib-imap-urlauth/Makefile.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-auth-client \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-imap \ - -I$(top_srcdir)/src/lib-imap-storage + -I$(top_srcdir)/src/lib-imap-storage \ + -I$(top_srcdir)/src/lib-var-expand libimap_urlauth_la_SOURCES = \ imap-urlauth.c \ diff --git a/src/lib-language/Makefile.am b/src/lib-language/Makefile.am index 0131b66acc..75a90d12e3 100644 --- a/src/lib-language/Makefile.am +++ b/src/lib-language/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-test \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-language \ + -I$(top_srcdir)/src/lib-var-expand \ $(LIBEXTTEXTCAT_CFLAGS) \ $(LIBICU_CFLAGS) \ -DUDHRDIR=\""$(top_srcdir)/src/lib-language"\" \ @@ -127,6 +128,7 @@ test_programs = \ noinst_PROGRAMS = $(test_programs) test_libs = \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la test_deps = $(noinst_LTLIBRARIES) $(test_libs) diff --git a/src/lib-lda/Makefile.am b/src/lib-lda/Makefile.am index e02b955be6..07de148238 100644 --- a/src/lib-lda/Makefile.am +++ b/src/lib-lda/Makefile.am @@ -9,7 +9,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-smtp \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-ssl-iostream + -I$(top_srcdir)/src/lib-ssl-iostream \ + -I$(top_srcdir)/src/lib-var-expand liblda_la_SOURCES = \ lda-settings.c \ diff --git a/src/lib-ldap/Makefile.am b/src/lib-ldap/Makefile.am index 9ddf216f70..4cc62a8903 100644 --- a/src/lib-ldap/Makefile.am +++ b/src/lib-ldap/Makefile.am @@ -39,6 +39,7 @@ pkginc_lib_HEADERS = $(headers) test_libs = \ ../lib-test/libtest.la \ ../lib-ssl-iostream/libssl_iostream.la \ + ../lib-var-expand/libvar_expand.la \ ../lib/liblib.la check-local: diff --git a/src/lib-login/Makefile.am b/src/lib-login/Makefile.am index ecbb409f31..56a16a4b42 100644 --- a/src/lib-login/Makefile.am +++ b/src/lib-login/Makefile.am @@ -34,6 +34,7 @@ test_libs = \ ../lib-dns/libdns.la \ ../lib-ssl-iostream/libssl_iostream.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la \ $(MODULE_LIBS) @@ -45,6 +46,7 @@ test_deps = \ ../lib-dns/libdns.la \ ../lib-ssl-iostream/libssl_iostream.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la diff --git a/src/lib-lua/Makefile.am b/src/lib-lua/Makefile.am index 31a0712cf3..1115e850be 100644 --- a/src/lib-lua/Makefile.am +++ b/src/lib-lua/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-ssl-iostream \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-master \ + -I$(top_srcdir)/src/lib-var-expand \ $(LUA_CFLAGS) noinst_LTLIBRARIES = libdlua.la diff --git a/src/lib-master/Makefile.am b/src/lib-master/Makefile.am index 4a698af1af..3403c12e37 100644 --- a/src/lib-master/Makefile.am +++ b/src/lib-master/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-test \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-ssl-iostream \ + -I$(top_srcdir)/src/lib-var-expand \ -DPKG_RUNDIR=\""$(rundir)"\" \ -DPKG_STATEDIR=\""$(statedir)"\" \ -DSYSCONFDIR=\""$(pkgsysconfdir)"\" \ @@ -54,6 +55,7 @@ test_deps = \ libmaster.la \ ../lib-ssl-iostream/libssl_iostream.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib-dns/libdns.la \ ../lib/liblib.la diff --git a/src/lib-oauth2/Makefile.am b/src/lib-oauth2/Makefile.am index 3775f3f2f7..1750a217f5 100644 --- a/src/lib-oauth2/Makefile.am +++ b/src/lib-oauth2/Makefile.am @@ -5,7 +5,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-http \ -I$(top_srcdir)/src/lib-dcrypt \ -I$(top_srcdir)/src/lib-dict \ - -I$(top_srcdir)/src/lib-settings + -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand noinst_LTLIBRARIES=liboauth2.la @@ -42,6 +44,7 @@ test_libs = \ ../lib-auth-client/libauth-client.la \ ../lib-dict/libdict.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la \ $(MODULE_LIBS) @@ -57,6 +60,7 @@ test_deps = \ ../lib-auth-client/libauth-client.la \ ../lib-dict/libdict.la \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la diff --git a/src/lib-program-client/Makefile.am b/src/lib-program-client/Makefile.am index cf0cb44e1b..0615238622 100644 --- a/src/lib-program-client/Makefile.am +++ b/src/lib-program-client/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-dns \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand \ -DPKG_RUNDIR=\""$(rundir)"\" libprogram_client_la_SOURCES = \ @@ -36,6 +37,7 @@ test_libs = \ ../lib-mail/libmail.la \ ../lib-settings/libsettings.la \ ../lib-charset/libcharset.la \ + ../lib-var-expand/libvar_expand.la \ ../lib/liblib.la \ $(MODULE_LIBS) diff --git a/src/lib-settings/Makefile.am b/src/lib-settings/Makefile.am index 2857927d7f..594decd19c 100644 --- a/src/lib-settings/Makefile.am +++ b/src/lib-settings/Makefile.am @@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libsettings.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib-test + -I$(top_srcdir)/src/lib-test \ + -I$(top_srcdir)/src/lib-var-expand libsettings_la_SOURCES = \ settings.c \ diff --git a/src/lib-smtp/Makefile.am b/src/lib-smtp/Makefile.am index 7873ca185a..4bb93061c1 100644 --- a/src/lib-smtp/Makefile.am +++ b/src/lib-smtp/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-dns \ -I$(top_srcdir)/src/lib-program-client \ -I$(top_srcdir)/src/lib-mail \ + -I$(top_srcdir)/src/lib-var-expand \ -DTEST_BIN_DIR=\"$(abs_srcdir)/test-bin\" smtp_server_cmds = \ @@ -114,6 +115,7 @@ test_libs = \ ../lib-auth/libauth.la \ ../lib-otp/libotp.la \ ../lib-json/libjson.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la \ $(MODULE_LIBS) @@ -131,6 +133,7 @@ test_deps = \ ../lib-sasl/libsasl.la \ ../lib-auth/libauth.la \ ../lib-json/libjson.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am index 96e1514574..30abd4e44c 100644 --- a/src/lib-sql/Makefile.am +++ b/src/lib-sql/Makefile.am @@ -39,6 +39,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-test \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-ssl-iostream \ + -I$(top_srcdir)/src/lib-var-expand \ $(SQL_CFLAGS) dist_sources = \ diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am index 8c6000ad75..4bcc60bcf5 100644 --- a/src/lib-ssl-iostream/Makefile.am +++ b/src/lib-ssl-iostream/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-test \ -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand \ -DMODULE_DIR=\""$(moduledir)"\" \ $(SSL_CFLAGS) @@ -44,6 +45,7 @@ test_libs = \ $(module_LTLIBRARIES) \ $(noinst_LTLIBRARIES) \ ../lib-settings/libsettings.la \ + ../lib-var-expand/libvar_expand.la \ ../lib-test/libtest.la \ ../lib/liblib.la diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am index 81037ed24e..f569eb7f78 100644 --- a/src/lib-storage/Makefile.am +++ b/src/lib-storage/Makefile.am @@ -18,6 +18,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-smtp \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ + -I$(top_srcdir)/src/lib-var-expand \ -DPKG_RUNDIR=\""$(rundir)"\" \ -DMODULEDIR=\""$(moduledir)"\" @@ -174,6 +175,7 @@ test_programs = \ noinst_PROGRAMS = $(test_programs) test_libs = \ + $(top_builddir)/src/lib-var-expand/libvar_expand.la \ $(top_builddir)/src/lib-test/libtest.la \ $(top_builddir)/src/lib/liblib.la diff --git a/src/lib-storage/index/Makefile.am b/src/lib-storage/index/Makefile.am index 973a51dbb0..4593f10def 100644 --- a/src/lib-storage/index/Makefile.am +++ b/src/lib-storage/index/Makefile.am @@ -12,7 +12,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ - -I$(top_srcdir)/src/lib-storage + -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand libstorage_index_la_SOURCES = \ istream-mail.c \ diff --git a/src/lib-storage/index/dbox-common/Makefile.am b/src/lib-storage/index/dbox-common/Makefile.am index ec3d511abb..e73e9bb2be 100644 --- a/src/lib-storage/index/dbox-common/Makefile.am +++ b/src/lib-storage/index/dbox-common/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-storage/index + -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-var-expand libstorage_dbox_common_la_SOURCES = \ dbox-attachment.c \ diff --git a/src/lib-storage/index/dbox-multi/Makefile.am b/src/lib-storage/index/dbox-multi/Makefile.am index 810edd21d9..715869c3c1 100644 --- a/src/lib-storage/index/dbox-multi/Makefile.am +++ b/src/lib-storage/index/dbox-multi/Makefile.am @@ -9,7 +9,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ - -I$(top_srcdir)/src/lib-storage/index/dbox-common + -I$(top_srcdir)/src/lib-storage/index/dbox-common \ + -I$(top_srcdir)/src/lib-var-expand libstorage_dbox_multi_la_SOURCES = \ mdbox-deleted-storage.c \ diff --git a/src/lib-storage/index/dbox-single/Makefile.am b/src/lib-storage/index/dbox-single/Makefile.am index cb3fabf51d..184b1d4b44 100644 --- a/src/lib-storage/index/dbox-single/Makefile.am +++ b/src/lib-storage/index/dbox-single/Makefile.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ - -I$(top_srcdir)/src/lib-storage/index/dbox-common + -I$(top_srcdir)/src/lib-storage/index/dbox-common \ + -I$(top_srcdir)/src/lib-var-expand libstorage_dbox_single_la_SOURCES = \ sdbox-copy.c \ diff --git a/src/lib-storage/index/imapc/Makefile.am b/src/lib-storage/index/imapc/Makefile.am index e0711fc11f..f128f6c4ec 100644 --- a/src/lib-storage/index/imapc/Makefile.am +++ b/src/lib-storage/index/imapc/Makefile.am @@ -12,7 +12,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/list \ -I$(top_srcdir)/src/lib-storage/index \ - -I$(top_srcdir)/src/lib-ssl-iostream + -I$(top_srcdir)/src/lib-ssl-iostream \ + -I$(top_srcdir)/src/lib-var-expand libstorage_imapc_la_SOURCES = \ imapc-attribute.c \ diff --git a/src/lib-storage/index/maildir/Makefile.am b/src/lib-storage/index/maildir/Makefile.am index 962cb1de28..a18a7b5ce2 100644 --- a/src/lib-storage/index/maildir/Makefile.am +++ b/src/lib-storage/index/maildir/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-storage/index + -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-var-expand libstorage_maildir_la_SOURCES = \ maildir-copy.c \ diff --git a/src/lib-storage/index/mbox/Makefile.am b/src/lib-storage/index/mbox/Makefile.am index 4165a20b32..22b5e0b709 100644 --- a/src/lib-storage/index/mbox/Makefile.am +++ b/src/lib-storage/index/mbox/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-storage/index + -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-var-expand libstorage_mbox_la_SOURCES = \ istream-raw-mbox.c \ diff --git a/src/lib-storage/index/pop3c/Makefile.am b/src/lib-storage/index/pop3c/Makefile.am index 093176ebeb..d9c40ee010 100644 --- a/src/lib-storage/index/pop3c/Makefile.am +++ b/src/lib-storage/index/pop3c/Makefile.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-storage/index + -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-var-expand libstorage_pop3c_la_SOURCES = \ pop3c-client.c \ diff --git a/src/lib-storage/index/raw/Makefile.am b/src/lib-storage/index/raw/Makefile.am index 903326f43b..3c7a0f77b8 100644 --- a/src/lib-storage/index/raw/Makefile.am +++ b/src/lib-storage/index/raw/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-storage/index + -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-var-expand libstorage_raw_la_SOURCES = \ raw-mail.c \ diff --git a/src/lib-storage/index/shared/Makefile.am b/src/lib-storage/index/shared/Makefile.am index 1bc6673b72..7d0be98db4 100644 --- a/src/lib-storage/index/shared/Makefile.am +++ b/src/lib-storage/index/shared/Makefile.am @@ -7,7 +7,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-storage/index + -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-var-expand libstorage_shared_la_SOURCES = \ shared-list.c \ diff --git a/src/lib-storage/list/Makefile.am b/src/lib-storage/list/Makefile.am index d0a1b77f94..5551b4d1eb 100644 --- a/src/lib-storage/list/Makefile.am +++ b/src/lib-storage/list/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-storage/index + -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-var-expand libstorage_list_la_SOURCES = \ mail-storage-list-index-rebuild.c \ diff --git a/src/lmtp/Makefile.am b/src/lmtp/Makefile.am index aed80bd96a..24bdabb0e3 100644 --- a/src/lmtp/Makefile.am +++ b/src/lmtp/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-lda \ -I$(top_srcdir)/src/lib-ssl-iostream \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ -I$(top_srcdir)/src/lib-storage/index/raw \ diff --git a/src/log/Makefile.am b/src/log/Makefile.am index 5b12c9a01e..c0d93c07f6 100644 --- a/src/log/Makefile.am +++ b/src/log/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-master \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) log_LDADD = $(LIBDOVECOT) \ diff --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am index d9e300ff35..cd196ed59c 100644 --- a/src/login-common/Makefile.am +++ b/src/login-common/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-login \ -I$(top_srcdir)/src/lib-ssl-iostream \ -I$(top_srcdir)/src/lib-mail \ + -I$(top_srcdir)/src/lib-var-expand \ -DPKG_STATEDIR=\""$(statedir)"\" \ -DMODULEDIR=\""$(moduledir)"\" diff --git a/src/master/Makefile.am b/src/master/Makefile.am index d4f47e8239..ccc0daaef7 100644 --- a/src/master/Makefile.am +++ b/src/master/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-auth \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-master \ + -I$(top_srcdir)/src/lib-var-expand \ -DPKG_RUNDIR=\""$(rundir)"\" \ -DPKG_STATEDIR=\""$(statedir)"\" \ -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \ diff --git a/src/plugins/acl/Makefile.am b/src/plugins/acl/Makefile.am index 0cc0016c05..86d46bf3f7 100644 --- a/src/plugins/acl/Makefile.am +++ b/src/plugins/acl/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/list \ -I$(top_srcdir)/src/lib-doveadm \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/doveadm NOPLUGIN_LDFLAGS = diff --git a/src/plugins/apparmor/Makefile.am b/src/plugins/apparmor/Makefile.am index a6b13d7160..2e81bbf1df 100644 --- a/src/plugins/apparmor/Makefile.am +++ b/src/plugins/apparmor/Makefile.am @@ -3,7 +3,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-index \ - -I$(top_srcdir)/src/lib-storage + -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand NOPLUGIN_LDFLAGS = lib01_apparmor_plugin_la_LDFLAGS = -module -avoid-version diff --git a/src/plugins/charset-alias/Makefile.am b/src/plugins/charset-alias/Makefile.am index dadb518252..406fb5b07f 100644 --- a/src/plugins/charset-alias/Makefile.am +++ b/src/plugins/charset-alias/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-charset \ -I$(top_srcdir)/src/lib-index \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/lib-storage NOPLUGIN_LDFLAGS = diff --git a/src/plugins/fs-compress/Makefile.am b/src/plugins/fs-compress/Makefile.am index ca6d51a6be..211932e798 100644 --- a/src/plugins/fs-compress/Makefile.am +++ b/src/plugins/fs-compress/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-compression \ - -I$(top_srcdir)/src/lib-fs + -I$(top_srcdir)/src/lib-fs \ + -I$(top_srcdir)/src/lib-var-expand NOPLUGIN_LDFLAGS = libfs_compress_la_SOURCES = fs-compress.c diff --git a/src/plugins/fts-flatcurve/Makefile.am b/src/plugins/fts-flatcurve/Makefile.am index e271a64f9c..428ba7f874 100644 --- a/src/plugins/fts-flatcurve/Makefile.am +++ b/src/plugins/fts-flatcurve/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-doveadm \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/doveadm \ -I$(top_srcdir)/src/plugins/fts \ $(XAPIAN_CFLAGS) diff --git a/src/plugins/fts-solr/Makefile.am b/src/plugins/fts-solr/Makefile.am index 7837e764cf..9095153b7d 100644 --- a/src/plugins/fts-solr/Makefile.am +++ b/src/plugins/fts-solr/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/plugins/fts NOPLUGIN_LDFLAGS = diff --git a/src/plugins/fts/Makefile.am b/src/plugins/fts/Makefile.am index 49d96b67f9..ae57d8f555 100644 --- a/src/plugins/fts/Makefile.am +++ b/src/plugins/fts/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ -I$(top_srcdir)/src/lib-doveadm \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/doveadm NOPLUGIN_LDFLAGS = diff --git a/src/plugins/imap-acl/Makefile.am b/src/plugins/imap-acl/Makefile.am index 80d966beda..fd9086fb5c 100644 --- a/src/plugins/imap-acl/Makefile.am +++ b/src/plugins/imap-acl/Makefile.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/imap \ -I$(top_srcdir)/src/plugins/acl \ -I$(top_srcdir)/src/lib-imap-client \ - -I$(top_srcdir)/src/lib-ssl-iostream + -I$(top_srcdir)/src/lib-ssl-iostream \ + -I$(top_srcdir)/src/lib-var-expand imap_moduledir = $(moduledir) diff --git a/src/plugins/last-login/Makefile.am b/src/plugins/last-login/Makefile.am index 90563330b1..ad1ba07ebe 100644 --- a/src/plugins/last-login/Makefile.am +++ b/src/plugins/last-login/Makefile.am @@ -5,7 +5,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ - -I$(top_srcdir)/src/lib-storage + -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand NOPLUGIN_LDFLAGS = lib10_last_login_plugin_la_LDFLAGS = -module -avoid-version diff --git a/src/plugins/lazy-expunge/Makefile.am b/src/plugins/lazy-expunge/Makefile.am index 7bd459095a..7104d5bd0b 100644 --- a/src/plugins/lazy-expunge/Makefile.am +++ b/src/plugins/lazy-expunge/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage/index \ -I$(top_srcdir)/src/lib-storage/index/maildir \ -I$(top_srcdir)/src/lib-imap \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/plugins/quota NOPLUGIN_LDFLAGS = diff --git a/src/plugins/mail-compress/Makefile.am b/src/plugins/mail-compress/Makefile.am index 72b03c3328..96f54e6189 100644 --- a/src/plugins/mail-compress/Makefile.am +++ b/src/plugins/mail-compress/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-compression \ -I$(top_srcdir)/src/lib-index \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ -I$(top_srcdir)/src/lib-storage/index/dbox-common diff --git a/src/plugins/mail-crypt/Makefile.am b/src/plugins/mail-crypt/Makefile.am index 5085e6c1e3..07a16a279e 100644 --- a/src/plugins/mail-crypt/Makefile.am +++ b/src/plugins/mail-crypt/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-dcrypt \ -I$(top_srcdir)/src/lib-fs \ -I$(top_srcdir)/src/lib-doveadm \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/doveadm \ -I$(top_srcdir)/src/plugins/acl diff --git a/src/plugins/mail-log/Makefile.am b/src/plugins/mail-log/Makefile.am index a2609d72a2..376243ba6f 100644 --- a/src/plugins/mail-log/Makefile.am +++ b/src/plugins/mail-log/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/plugins/notify NOPLUGIN_LDFLAGS = diff --git a/src/plugins/mail-lua/Makefile.am b/src/plugins/mail-lua/Makefile.am index 2f4b9c76f7..cab4b32ea3 100644 --- a/src/plugins/mail-lua/Makefile.am +++ b/src/plugins/mail-lua/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-lua \ + -I$(top_srcdir)/src/lib-var-expand \ $(LUA_CFLAGS) NOPLUGIN_LDFLAGS = diff --git a/src/plugins/notify-status/Makefile.am b/src/plugins/notify-status/Makefile.am index b9d3564df8..171d1218a8 100644 --- a/src/plugins/notify-status/Makefile.am +++ b/src/plugins/notify-status/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-dict \ -I$(top_srcdir)/src/lib-settings \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/plugins/notify NOPLUGIN_LDFLAGS = diff --git a/src/plugins/pop3-migration/Makefile.am b/src/plugins/pop3-migration/Makefile.am index a4545e1046..4d0902a847 100644 --- a/src/plugins/pop3-migration/Makefile.am +++ b/src/plugins/pop3-migration/Makefile.am @@ -5,7 +5,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ - -I$(top_srcdir)/src/lib-storage/index + -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-var-expand NOPLUGIN_LDFLAGS = lib05_pop3_migration_plugin_la_LDFLAGS = -module -avoid-version diff --git a/src/plugins/push-notification/Makefile.am b/src/plugins/push-notification/Makefile.am index eab09a2028..dfe0b57ce9 100644 --- a/src/plugins/push-notification/Makefile.am +++ b/src/plugins/push-notification/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-ssl-iostream \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/plugins/notify NOPLUGIN_LDFLAGS = diff --git a/src/plugins/quota-clone/Makefile.am b/src/plugins/quota-clone/Makefile.am index 89e887b910..9335e6c24c 100644 --- a/src/plugins/quota-clone/Makefile.am +++ b/src/plugins/quota-clone/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/plugins/quota NOPLUGIN_LDFLAGS = diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am index 8d8ea34154..cf6a098757 100644 --- a/src/plugins/quota/Makefile.am +++ b/src/plugins/quota/Makefile.am @@ -21,6 +21,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage/index/maildir \ -I$(top_srcdir)/src/lib-program-client \ -I$(top_srcdir)/src/lib-doveadm \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/doveadm \ $(LIBTIRPC_CFLAGS) diff --git a/src/plugins/trash/Makefile.am b/src/plugins/trash/Makefile.am index 3459c7b972..8e2eb0783f 100644 --- a/src/plugins/trash/Makefile.am +++ b/src/plugins/trash/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/plugins/quota NOPLUGIN_LDFLAGS = diff --git a/src/plugins/virtual/Makefile.am b/src/plugins/virtual/Makefile.am index c96e60790e..95d63e3681 100644 --- a/src/plugins/virtual/Makefile.am +++ b/src/plugins/virtual/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ - -I$(top_srcdir)/src/lib-imap-storage + -I$(top_srcdir)/src/lib-imap-storage \ + -I$(top_srcdir)/src/lib-var-expand NOPLUGIN_LDFLAGS = lib20_virtual_plugin_la_LDFLAGS = -module -avoid-version diff --git a/src/plugins/welcome/Makefile.am b/src/plugins/welcome/Makefile.am index 3348f9cc50..cf5cd950f3 100644 --- a/src/plugins/welcome/Makefile.am +++ b/src/plugins/welcome/Makefile.am @@ -4,7 +4,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-program-client \ - -I$(top_srcdir)/src/lib-storage + -I$(top_srcdir)/src/lib-storage \ + -I$(top_srcdir)/src/lib-var-expand NOPLUGIN_LDFLAGS = lib99_welcome_plugin_la_LDFLAGS = -module -avoid-version diff --git a/src/pop3-login/Makefile.am b/src/pop3-login/Makefile.am index 1c87773e36..f639d48433 100644 --- a/src/pop3-login/Makefile.am +++ b/src/pop3-login/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-login \ -I$(top_srcdir)/src/login-common \ -I$(top_srcdir)/src/lib-pop3 \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) pop3_login_LDADD = \ diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am index b06ec364e3..6499d4f83e 100644 --- a/src/pop3/Makefile.am +++ b/src/pop3/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-pop3 \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) pop3_LDFLAGS = -export-dynamic \ diff --git a/src/stats/Makefile.am b/src/stats/Makefile.am index 2415bceb57..a0e397bad0 100644 --- a/src/stats/Makefile.am +++ b/src/stats/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-http \ -I$(top_srcdir)/src/lib-ssl-iostream \ -I$(top_srcdir)/src/lib-test \ + -I$(top_srcdir)/src/lib-var-expand \ $(BINARY_CFLAGS) stats_LDADD = \ diff --git a/src/submission-login/Makefile.am b/src/submission-login/Makefile.am index 92fdeccb39..928da154ad 100644 --- a/src/submission-login/Makefile.am +++ b/src/submission-login/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-login \ -I$(top_srcdir)/src/lib-smtp \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/login-common submission_login_LDADD = \ diff --git a/src/submission/Makefile.am b/src/submission/Makefile.am index b0f1c104e3..81a216f304 100644 --- a/src/submission/Makefile.am +++ b/src/submission/Makefile.am @@ -14,6 +14,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-login \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ -I$(top_srcdir)/src/lib-storage/index/raw \ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index f1d6780396..5f94bb109c 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -19,6 +19,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-index \ + -I$(top_srcdir)/src/lib-var-expand \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/auth \ -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \