diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2020-07-23 18:08:50 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2020-07-23 18:08:50 +0300 |
| commit | 01ea366501d3a5007cd1edd3b10381299dd71ee2 (patch) | |
| tree | 9a3c7d8c30e312bba7369bd04b1053ef29e597e1 | |
| parent | f4df8a05b9c015b389542b8e94f10840b95836e5 (diff) | |
| download | mailfromd-01ea366501d3a5007cd1edd3b10381299dd71ee2.tar.gz mailfromd-01ea366501d3a5007cd1edd3b10381299dd71ee2.tar.bz2 | |
Fix compilation without libnettle
* NEWS: Version 8.7.91
* configure.ac: Likewise.
Define WITH_DKIM.
* mflib/Makefile.am [NETTLE_COND]: Add dkim.mf conditionally.
* src/Makefile.am [NETTLE_COND]: Remove appending to AM_CPPFLAGS:
symbol defined in config.h
* src/builtin/Makefile.am (BI_FILES): Add dkim.bi unconditionally.
* src/builtin/dkim.bi: Mark source with MF_COND(WITH_DKIM)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | mflib/Makefile.am | 14 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/builtin/Makefile.am | 5 | ||||
| -rw-r--r-- | src/builtin/dkim.bi | 1 |
6 files changed, 17 insertions, 17 deletions
@@ -1,9 +1,9 @@ -Mailfromd NEWS -- history of user-visible changes. 2020-07-13 +Mailfromd NEWS -- history of user-visible changes. 2020-07-22 See the end of file for copying conditions. Please send Mailfromd bug reports to <bug-mailfromd@gnu.org.ua> -Version 8.7.90 (git) +Version 8.7.91 (git) * DKIM signing diff --git a/configure.ac b/configure.ac index 7f555044..829bd2a5 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.63) m4_define([MF_VERSION_MAJOR], 8) m4_define([MF_VERSION_MINOR], 7) -m4_define([MF_VERSION_PATCH], 90) +m4_define([MF_VERSION_PATCH], 91) AC_INIT([mailfromd], MF_VERSION_MAJOR.MF_VERSION_MINOR[]m4_ifdef([MF_VERSION_PATCH],.MF_VERSION_PATCH), [bug-mailfromd@gnu.org.ua], @@ -105,6 +105,10 @@ if test "$ac_cv_header_nettle_sha2_h$ac_cv_header_nettle_buffer_h$ac_cv_header_n fi AM_CONDITIONAL([NETTLE_COND],[test -n "$NETTLE_LIBS"]) +if test -n "$NETTLE_LIBS"; then + AC_DEFINE([WITH_DKIM], [1], [Enable DKIM functions]) +fi + ### Check for Emacs site-lisp directory AM_PATH_LISPDIR diff --git a/mflib/Makefile.am b/mflib/Makefile.am index 1d9d4256..ce9a7312 100644 --- a/mflib/Makefile.am +++ b/mflib/Makefile.am @@ -20,10 +20,6 @@ inc_DATA =\ $(PP_SETUP_FILE)\ status.mfh -if DSPAM_COND - DSPAM_MODULE = dspam.mf -endif - MF4_FILES=\ callout.mf4\ dns.mf4\ @@ -52,10 +48,16 @@ MF_FILES =\ strip_domain_part.mf\ valid_domain.mf\ verp.mf\ - dkim.mf\ - $(DSPAM_MODULE)\ $(MF4_FILES:.mf4=.mf) +if DSPAM_COND + MF_FILES += dspam.mf +endif + +if NETTLE_COND + MF_FILES += dkim.mf +endif + noinst_HEADERS = \ dspam.h\ email.h\ diff --git a/src/Makefile.am b/src/Makefile.am index 6d7f30f3..fe7868a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -126,10 +126,6 @@ if PREPROC_COND AM_CPPFLAGS += -DDEFAULT_PREPROCESSOR="\"$(DEFAULT_PREPROCESSOR)\"" endif -if NETTLE_COND - AM_CPPFLAGS += -DWITH_DKIM=1 -endif - node-type.h: drivers.c $(AM_V_GEN) $(AWK) -v MODE=types -f $(top_srcdir)/src/drv.awk drivers.c > node-type.h diff --git a/src/builtin/Makefile.am b/src/builtin/Makefile.am index d8c4fe30..acf4a067 100644 --- a/src/builtin/Makefile.am +++ b/src/builtin/Makefile.am @@ -25,6 +25,7 @@ BI_FILES=\ curhdr.bi\ db.bi\ debug.bi\ + dkim.bi\ dns.bi\ dspam.bi\ email.bi\ @@ -57,10 +58,6 @@ BI_FILES=\ vars.bi\ qrnt.bi -if NETTLE_COND - BI_FILES += dkim.bi -endif - libbuiltin_a_SOURCES = builtin.c $(BI_FILES:.bi=.c) EXTRA_DIST = \ diff --git a/src/builtin/dkim.bi b/src/builtin/dkim.bi index 661e22b5..6265af9d 100644 --- a/src/builtin/dkim.bi +++ b/src/builtin/dkim.bi @@ -15,6 +15,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ MF_BUILTIN_MODULE +MF_COND(WITH_DKIM) #include "dkim.h" #include "msg.h" |