global: Include lib-var-expand where needed

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index c8351eed1abe9f6b2625e3cd38a45957aca207ab..c74ecafad4cf132af1497def1a266206242b6aa4 100644 (file)
--- 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 01369987b76638e73e5bbd01789a160dcda6c65c..54d5b1db05f1df7bd8352b965ce749392249c7a3 100644 (file)
--- 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 2a672d08b97adb401fd9068020547b965fda9400..e758591ff8d169d48873c7de50f0565ba211a87c 100644 (file)
--- 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 5f0cf3772b9bab54a17258c7f0a9a89cb299ccbb..cd5a4c4b7706bc55a7ac53ca0ebb6074f7cdc8d2 100644 (file)
--- 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 6bb01b1973f705cfb1b3da033bc6b8f98ccbccce..70316d22c0410bca134b5656cd5b9daf52babc0f 100644 (file)
--- 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 87f4b6cdf198b0f5240ccbba8cb3985539974d9c..c73a151989225c5f645d95a1027bca74a4a7ddde 100644 (file)
--- 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 21fc450630d520695363395a58c842e549610651..63c2d6c28b0374fa8992fb624857dfc6525cd495 100644 (file)
--- 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 e696b8d34294c91de1dcab93135a4242200e8115..3e65e88f2861f308fd5aaf0cdc225ce10348b629 100644 (file)
--- 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 3641c90e1370e8168bf51992c043e1a936e9cd39..17aa7074abf41dff3f8e719acef96bc150d15b29 100644 (file)
--- 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 d58e3d062bfe9527368ec9dd8a0c63f26182e091..b0a240ff4f3a967fb8cd2f4d2265a9c9d525a462 100644 (file)
--- 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 d0c0d977d5e3c0faf23a7e15d8ec545cb40227aa..d44e24c488ba57e72c36f48044349becac06fa93 100644 (file)
--- 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 168eba679e534f0ec596205a2439fe417e364c7d..0b38db2ea97ae5ee0e764f3deb2790971a17cf63 100644 (file)
--- 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 fbc70aeff0f340c66d33dc62157dae7ad8da6fb6..be2afe57f0028b002f7bd94eb6a1b70731b97166 100644 (file)
--- 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 d455ea6b20b6c34024d2066cf7b9332294f57305..cd264320da3a25c8983feeaadb7316c30b275214 100644 (file)
--- 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 eb1807972b8a0027c4d398c5bad20206c0969bee..c7b3fe3045ffc683f976278fd2832de7dabf8317 100644 (file)
--- 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 ffdebeea3c4d1de901d35a7970d0e52791eab7bb..90374e53c7d69cf2a552183270d752d9a42132ad 100644 (file)
--- 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 82ee849089ffa0f8dad13d5a88433f86843c7fe5..87413cf50f9ead586a56970352eabf833ba13d69 100644 (file)
--- 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 87b9167f3cf260c4c94de98578650a9696949eba..e7016aeb760e2f37d184781bf32b97af35f4afee 100644 (file)
--- 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 42c7ef7cc84a090f1a3630da8f5e802b593ae394..2537e3b091bd7632f3249667377c89156c48eb23 100644 (file)
--- 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 4bc2f0bdf2b59b8f3ff4e2f6d7ae31f6695072e6..ebceda306424a000d27edc70472ab58eb4ea001b 100644 (file)
--- 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 85293f53722202438743affca7395a70686ac0c9..084b3fe96fa5e27798586bbae13de3bbcc2486ea 100644 (file)
--- 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 595c400541c4f93db7149373697a549357a484b4..bbde3d00b84ff52b8030d11ca9bcb0c06736ff0a 100644 (file)
--- 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 3a123d41b145bdc8d37eb3e1aee4cd57b67ad2e5..e5223a3b9a4e3de0f8da9090ea04e881303dcc50 100644 (file)
--- 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 24c36fba3dce65881cae761f420e4478e11da952..b081780f0b5465db536e96019febbf0112a912f4 100644 (file)
--- 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 16e1b0cda9d0d283bda273562226afa2820c74a5..5b77658691aa29892fd01159f0fa8b3215923387 100644 (file)
--- 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 0131b66acc58f46cf13e1ac5fff40ef00a238d86..75a90d12e38f141c7f8bbf135f97d44d88d43005 100644 (file)
--- 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 e02b955be6a987eb86430e686dfc3c3a8c23cc77..07de148238d4c0d2c33d09b82d0407a2b3d47a26 100644 (file)
--- 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 9ddf216f708045c692a25cbb966786fae46bed24..4cc62a8903f0100908371cff87ae4a7a05394b8b 100644 (file)
--- 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 ecbb409f317b6ef8aee2cd4369df14070724156f..56a16a4b42dabdcfe2a5bfde154edfab2e9a9f83 100644 (file)
--- 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 31a0712cf395b9fe9d7e70954d7c45d5ed227f27..1115e850bebf287537f0448f4987759c6a994948 100644 (file)
--- 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 4a698af1af790e93b04ca58ae17b280aab530b5b..3403c12e374918a08e51b382269f5cb9a328efd5 100644 (file)
--- 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 3775f3f2f77828ca6939fbbb1f85a63e3b0b54fb..1750a217f5a8ce502da607e16d65a7cde97e6791 100644 (file)
--- 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 cf0cb44e1b1ceb2c54ff7b2d340cb02ab678b7ba..061523862298d22c5eff212e9bda82492362b954 100644 (file)
--- 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 2857927d7f93fbe18bd583ad2b4671d987c4e6ed..594decd19c61363e9f17dcef703c3e07099ff346 100644 (file)
--- 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 7873ca185a007f61f0aba169a95b0b5c962f2bae..4bb93061c1c950229b2f41d913349cd62439f569 100644 (file)
--- 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 96e1514574a597438b92935ece520e1274fed8e5..30abd4e44cf46700480113af934b384572b8a7b2 100644 (file)
--- 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 8c6000ad75b89eb3c965e28666d0bc6663e7eed0..4bcc60bcf50a51ced355791280095139b139d38e 100644 (file)
--- 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 81037ed24ee8073129096c7cb180ee8c802a272d..f569eb7f7872d134fa89a8dfe5d520f5ecca4cb9 100644 (file)
--- 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 973a51dbb0513ec7e020510bc37d2b8c5ae2e328..4593f10defac362a47b788aaae25a1260fb5cfdb 100644 (file)
--- 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 ec3d511abbb42bd9c1accc71f1bb0419a591d159..e73e9bb2bea7f54ee1919edcbfe147af038a2490 100644 (file)
--- 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 810edd21d97749354aebab9663617c9920422631..715869c3c122886b441cdb3ffa074feadd89b880 100644 (file)
--- 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 cb3fabf51d2389b656ba910eeeba7de3a2c00563..184b1d4b445b53ac4f81257884c9c15f682eff2e 100644 (file)
--- 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 e0711fc11f501e004280bb59c99b3f54eec1c69f..f128f6c4ec9ad526b7adf98bde2da0deabc252c1 100644 (file)
--- 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 962cb1de28d3186a266dc24dbe3b0ff10eb9e469..a18a7b5ce24fd65e37d988990e8ef8c845a08de6 100644 (file)
--- 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 4165a20b3280db4a894e789c76427ecf2ea44161..22b5e0b709e3629b0d8ef195d0314674a990f38d 100644 (file)
--- 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 093176ebeb8d9ff28b2399f07a660ff102484a0e..d9c40ee01098b1ff79a3083a91407e99e1af397c 100644 (file)
--- 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 903326f43ba22bdf2a10e819cb696a02445f303c..3c7a0f77b8d29ace20db3f878ef5d7a3d034396d 100644 (file)
--- 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 1bc6673b72bab37b86f02f631da1f4c928867927..7d0be98db4a90840105482fe7d4560057ea2dd11 100644 (file)
--- 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 d0a1b77f94a21280a0d31a71564520102ad1ad59..5551b4d1eb67d0613d5243a18e0259de6213f0c4 100644 (file)
--- 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 aed80bd96a096bbd2f1d708a0de5c290d7ecc587..24bdabb0e39419670ab6f6b40b2db6df983c3e47 100644 (file)
--- 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 5b12c9a01e52681ceffc9a43f4e64c57289970a9..c0d93c07f6e459a9e68c3431aae90807f986a537 100644 (file)
--- 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 d9e300ff35b075dfc63b4614ad2af22c541627a8..cd196ed59c92419b8417a8d09efe9738d3768c27 100644 (file)
--- 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 d4f47e82390be590f5abf2b77face3b346446136..ccc0daaef70d55cf4d5acd8a228bb317b35e89cf 100644 (file)
--- 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 0cc0016c056ce96fc12f8a0ea73b18012c4ef296..86d46bf3f70da31b1633fedc38188f6ceac632b3 100644 (file)
--- 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 a6b13d7160749c45d247ee4f586245a7c5c60b9e..2e81bbf1df9ff8e154a61f78be9da5b95714f2b0 100644 (file)
--- 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 dadb51825216226a8d2d83afb9aeaecbe63383d9..406fb5b07fb10cd1598569a5d4a19e07bcdc30c0 100644 (file)
--- 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 ca6d51a6be390231eacb6b033f5573f1cacbbb1c..211932e79827301ea465985a40d6ac928955cd48 100644 (file)
--- 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 e271a64f9cb83bb90ee3c7688d173c31789c6086..428ba7f8740dd343c4358d4dfc44cf58b3b48ed0 100644 (file)
--- 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 7837e764cfdff102098ff6e1350c6b60941d537e..9095153b7dfeed7ba7ed52379abc5a563ca39b4f 100644 (file)
--- 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 49d96b67f92940c2a5f83e0ab5a189b994fbe3b0..ae57d8f5550b81589f1f695c30e4fde86bd3fe2b 100644 (file)
--- 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 80d966bedaa7c5838542537a852a75e74f3cd613..fd9086fb5cb72cd1e14722327db722d41041c465 100644 (file)
--- 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 90563330b1fa99fb5d4fa6d7ccf096a0a8329205..ad1ba07ebeff0a8f4af3d325e02484645d511137 100644 (file)
--- 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 7bd459095a7f64b9fb5b0ca90aab962d3940f789..7104d5bd0b7616efc4a3bff0a834af81b88df910 100644 (file)
--- 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 72b03c3328ee8cec5f001f1cb814e6b4469a477c..96f54e618975a40a7713a74c1702c4ee3c3b8183 100644 (file)
--- 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 5085e6c1e331e04a6aa5320e7d76817e61dbd878..07a16a279e9340cb791a90802fa75abebbd90763 100644 (file)
--- 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 a2609d72a25a03988554e54060e73898721f7bd0..376243ba6fc29266c8b8fc8c84fc4b141bed4658 100644 (file)
--- 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 2f4b9c76f74daba792628c98d9d292e6d0d084e1..cab4b32ea37af2ae8e70d2c4b43acc6a8249c8f6 100644 (file)
--- 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 b9d3564df8ef6c5340e96407851052c4e66cab9a..171d1218a8c11623bb93324c8937d4b674b50e21 100644 (file)
--- 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 a4545e1046c2555146bbd0d6de637bffb5aaa5a5..4d0902a84711769d034ff72e7b75c4def8bd34da 100644 (file)
--- 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 eab09a202891d82d309bc3d6e03fe528e7d7cd2e..dfe0b57ce9ae974e31c1bd91b27a62b7477f0353 100644 (file)
--- 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 89e887b9103e2398fd22698f8bb203b2bbb2e9c3..9335e6c24c38d469b080398c02c2e7c101bd18cc 100644 (file)
--- 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 8d8ea34154a56b65b4d93ae2a48ded41d6cd695f..cf6a098757d1b6132c1ba3d53c28074d0260f314 100644 (file)
--- 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 3459c7b972be905a53aa97d976dec144ad954e1f..8e2eb0783f72e76d14280ffda44deb2003d84689 100644 (file)
--- 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 c96e60790e6d021c11a99c4f7907f50c99f74200..95d63e36812c44851f03994a6367991e0ff4cf51 100644 (file)
--- 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 3348f9cc50a75f89a1842600ab3e62ace29db1d0..cf5cd950f3a138b198a65aebd64f07f219825128 100644 (file)
--- 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 1c87773e3643ac624ebc192f9cc4b7aaf0089f08..f639d484336c84bf9eaaa25b5f81710de430edab 100644 (file)
--- 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 b06ec364e3fce0b1a0cd9a14ecbeb4f0b655dc2b..6499d4f83ecb1ed69e13ea4233f87c52108a8953 100644 (file)
--- 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 2415bceb57a4d49e77eff66a92ad84da750ace6d..a0e397bad00a6f0a2b189dd7d216cacd31bd66df 100644 (file)
--- 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 92fdeccb399cb2cd3c3e9bab989c940df7c8a01a..928da154ad37e3a01555484720d9c2892085ae7c 100644 (file)
--- 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 b0f1c104e3b3eb78fd67ad635f23d161df4f0f2e..81a216f304f8aeafdaba6a60e6c2f5288996e379 100644 (file)
--- 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 f1d6780396f91a0ad0a7fc459d47b0ed63c6add3..5f94bb109c87e9ec4cf192991092feb51d5e7ae8 100644 (file)
--- 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)"\" \