From 91f7714d6bee3ac378678647fa6bda831b1dd1cc Mon Sep 17 00:00:00 2001 From: Jakob Gahde Date: Fri, 9 Aug 2024 18:53:53 +0200 Subject: [PATCH] Fix libcyrus_imap not being linked to dependency libcyrus_sieve --- Makefile.am | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0b7ea3a511..669dfa897c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,6 +145,25 @@ endif # COM_ERR bin_PROGRAMS = imtest/imtest +if SIEVE + +if PERL +SUBDIRS += perl/sieve/managesieve +noinst_LTLIBRARIES += perl/sieve/lib/libisieve.la +endif # PERL + +BUILT_SOURCES += sieve/addr.c sieve/sieve.c sieve/sieve_err.c +noinst_LTLIBRARIES += sieve/libcyrus_sieve_lex.la +lib_LTLIBRARIES += sieve/libcyrus_sieve.la +check_PROGRAMS += sieve/test sieve/test_mailbox +sbin_PROGRAMS += sieve/sievec sieve/sieved + +if SERVER +libexec_PROGRAMS += timsieved/timsieved +endif # SERVER + +endif # SIEVE + if SERVER BUILT_SOURCES += \ imap/http_err.c \ @@ -296,25 +315,6 @@ SUBDIRS += perl/annotator perl/imap noinst_LTLIBRARIES += perl/libcyrus.la perl/libcyrus_min.la endif # PERL -if SIEVE - -if PERL -SUBDIRS += perl/sieve/managesieve -noinst_LTLIBRARIES += perl/sieve/lib/libisieve.la -endif # PERL - -BUILT_SOURCES += sieve/addr.c sieve/sieve.c sieve/sieve_err.c -noinst_LTLIBRARIES += sieve/libcyrus_sieve_lex.la -lib_LTLIBRARIES += sieve/libcyrus_sieve.la -check_PROGRAMS += sieve/test sieve/test_mailbox -sbin_PROGRAMS += sieve/sievec sieve/sieved - -if SERVER -libexec_PROGRAMS += timsieved/timsieved -endif # SERVER - -endif # SIEVE - EXTRA_DIST = \ COPYING \ README.md \ @@ -1131,6 +1131,8 @@ if SIEVE imap_libcyrus_imap_la_SOURCES += \ imap/sieve_db.c \ imap/sieve_db.h +imap_libcyrus_imap_la_LIBADD += \ + sieve/libcyrus_sieve.la endif # SIEVE if OBJECTSTORE