git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move ESMPT LIMITS extension from experimental to mainline
[exim.git]
/
src
/
src
/
macro_predef.c
diff --git
a/src/src/macro_predef.c
b/src/src/macro_predef.c
index 8fade68ca5f7f6e1688a7f3875a7a53207ec1ac8..9b354d345f57e34d81654548775f5775407d3b01 100644
(file)
--- a/
src/src/macro_predef.c
+++ b/
src/src/macro_predef.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) The Exim Maintainers 2020 - 202
2
*/
+/* Copyright (c) The Exim Maintainers 2020 - 202
3
*/
/* Copyright (c) Jeremy Harris 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* Copyright (c) Jeremy Harris 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
@@
-119,6
+119,12
@@
due to conflicts with other common macros. */
#ifdef SUPPORT_PAM
builtin_macro_create(US"_HAVE_PAM");
#endif
#ifdef SUPPORT_PAM
builtin_macro_create(US"_HAVE_PAM");
#endif
+#ifdef RADIUS_CONFIG_FILE
+ builtin_macro_create(US"_HAVE_RADIUS");
+#endif
+#ifdef CYRUS_PWCHECK_SOCKET
+ builtin_macro_create(US"_HAVE_PWCHECK");
+#endif
#ifdef EXIM_PERL
builtin_macro_create(US"_HAVE_PERL");
#endif
#ifdef EXIM_PERL
builtin_macro_create(US"_HAVE_PERL");
#endif
@@
-154,6
+160,9
@@
due to conflicts with other common macros. */
#ifndef DISABLE_DNSSEC
builtin_macro_create(US"_HAVE_DNSSEC");
#endif
#ifndef DISABLE_DNSSEC
builtin_macro_create(US"_HAVE_DNSSEC");
#endif
+#ifndef DISABLE_ESMTP_LIMITS
+ builtin_macro_create(US"_HAVE_ESMTP_LIMITS");
+#endif
#ifndef DISABLE_EVENT
builtin_macro_create(US"_HAVE_EVENT");
#endif
#ifndef DISABLE_EVENT
builtin_macro_create(US"_HAVE_EVENT");
#endif
@@
-303,9
+312,6
@@
exp_features(void)
#ifdef EXPERIMENTAL_DSN_INFO
builtin_macro_create(US"_EXP_DSNI");
#endif
#ifdef EXPERIMENTAL_DSN_INFO
builtin_macro_create(US"_EXP_DSNI");
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
- builtin_macro_create(US"_EXP_LIMITS");
-#endif
#ifdef EXPERIMENTAL_QUEUEFILE
builtin_macro_create(US"_EXP_QUEUEFILE");
#endif
#ifdef EXPERIMENTAL_QUEUEFILE
builtin_macro_create(US"_EXP_QUEUEFILE");
#endif