aboutsummaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
Diffstat (limited to 'devtools')
-rw-r--r--devtools/M4/UNIX/all.m424
-rw-r--r--devtools/M4/UNIX/check.m42
-rw-r--r--devtools/M4/UNIX/sm-test.m42
-rw-r--r--devtools/OS/Darwin.19.x23
-rw-r--r--devtools/OS/Darwin.20.x24
-rw-r--r--devtools/Site/site.config.m4.sample24
6 files changed, 87 insertions, 12 deletions
diff --git a/devtools/M4/UNIX/all.m4 b/devtools/M4/UNIX/all.m4
index b0f2435ba04e..cde5f83e1459 100644
--- a/devtools/M4/UNIX/all.m4
+++ b/devtools/M4/UNIX/all.m4
@@ -33,7 +33,7 @@ TESTS=bldCHECK_TARGETS')
VPATH=${srcdir}
changequote([[, ]])
check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
list='$(TESTS)'; \
srcdir=$(srcdir); export srcdir; \
if test -n "$$list"; then \
@@ -65,6 +65,9 @@ check-TESTS: $(TESTS)
echo "FAIL: $$tst"; \
;; \
esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ res=SKIP; \
fi; \
done; \
if test "$$failed" -eq 0; then \
@@ -80,7 +83,19 @@ check-TESTS: $(TESTS)
banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
fi; \
fi; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
+ skipped=""; \
+ dashes="$$banner"; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ test -z "$$skipped" || echo "$$skipped"; \
echo "$$dashes"; \
echo "$$banner"; \
echo "$$dashes"; \
@@ -88,11 +103,12 @@ check-TESTS: $(TESTS)
fi
changequote(`, ')
-check-am: all
+check-am: make-test all
$(MAKE) $(check_PROGRAMS)
$(MAKE) check-TESTS
check: check-am
-
+make-test:
+ ifdef(`confTEST_PRGS', `(cd ${SRCDIR}/test && $(MAKE) confTEST_PRGS)')
define(`bldADD_SRC_CHK', ${$1SRCS_CHK} )dnl
SRCS_CHK=bldFOREACH(`bldADD_SRC_CHK(', bldC_CHECKS)
diff --git a/devtools/M4/UNIX/check.m4 b/devtools/M4/UNIX/check.m4
index 40cc62462656..b19a5a845ca7 100644
--- a/devtools/M4/UNIX/check.m4
+++ b/devtools/M4/UNIX/check.m4
@@ -11,6 +11,8 @@ divert(-1)
#
# $Id: check.m4,v 8.6 2013-11-22 20:51:22 ca Exp $
#
+divert(0)dnl
+divert(-1)
define(`smcheck', `dnl
ifelse(X`'$2, `X', `', `ifelse(index($2, `run'), `-1', `', `dnl
bldLIST_PUSH_ITEM(`bldCHECK_TARGETS', $1)dnl
diff --git a/devtools/M4/UNIX/sm-test.m4 b/devtools/M4/UNIX/sm-test.m4
index a71f8c96d307..69f8036e03ed 100644
--- a/devtools/M4/UNIX/sm-test.m4
+++ b/devtools/M4/UNIX/sm-test.m4
@@ -7,7 +7,7 @@ divert(-1)
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
-# Compile/run a test program for libsm.
+# Compile/run a test program.
#
# $Id: sm-test.m4,v 1.8 2013-11-22 20:51:23 ca Exp $
#
diff --git a/devtools/OS/Darwin.19.x b/devtools/OS/Darwin.19.x
new file mode 100644
index 000000000000..db378d2c13fc
--- /dev/null
+++ b/devtools/OS/Darwin.19.x
@@ -0,0 +1,23 @@
+dnl DO NOT EDIT THIS FILE.
+dnl Place personal settings in devtools/Site/site.config.m4
+
+#
+define(`confCC', `cc -pipe ${Extra_CC_Flags}')
+define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
+define(`confENVDEF', `-DDARWIN=190000 -DBIND_8_COMPAT -DNETINET6')
+define(`confLDOPTS', `${Extra_LD_Flags}')
+define(`confMTLDOPTS', `-lpthread')
+define(`confMILTER_STATIC', `')
+define(`confDEPEND_TYPE', `CC-M')
+define(`confOPTIMIZE', `-O3')
+define(`confRANLIBOPTS', `-c')
+define(`confHFDIR', `/usr/share/sendmail')
+define(`confINSTALL_RAWMAN')
+define(`confMANOWN', `root')
+define(`confMANGRP', `wheel')
+define(`confUBINOWN', `root')
+define(`confUBINGRP', `wheel')
+define(`confSBINOWN', `root')
+define(`confSBINGRP', `wheel')
+define(`confLDOPTS_SO', `-dynamiclib -flat_namespace -undefined suppress -single_module')
+define(`confSHAREDLIB_EXT', `.dylib')
diff --git a/devtools/OS/Darwin.20.x b/devtools/OS/Darwin.20.x
new file mode 100644
index 000000000000..032d10449fcf
--- /dev/null
+++ b/devtools/OS/Darwin.20.x
@@ -0,0 +1,24 @@
+dnl DO NOT EDIT THIS FILE.
+dnl Place personal settings in devtools/Site/site.config.m4
+
+#
+define(`confCC', `cc -pipe ${Extra_CC_Flags}')
+define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
+define(`confENVDEF', `-DDARWIN=200000 -DBIND_8_COMPAT -DNETINET6')
+define(`confLDOPTS', `${Extra_LD_Flags}')
+define(`confMTLDOPTS', `-lpthread')
+define(`confMILTER_STATIC', `')
+define(`confDEPEND_TYPE', `CC-M')
+define(`confOPTIMIZE', `-O3')
+define(`confRANLIBOPTS', `-c')
+define(`confHFDIR', `/usr/share/sendmail')
+define(`confINSTALL_RAWMAN')
+define(`confMANOWN', `root')
+define(`confMANGRP', `wheel')
+define(`confUBINOWN', `root')
+define(`confUBINGRP', `wheel')
+define(`confSBINOWN', `root')
+define(`confSBINGRP', `wheel')
+define(`confLDOPTS_SO', `-dynamiclib -flat_namespace -undefined suppress -single_module')
+define(`confSHAREDLIB_EXT', `.dylib')
+APPENDDEF(`conf_sendmail_LIBS', `-lresolv')
diff --git a/devtools/Site/site.config.m4.sample b/devtools/Site/site.config.m4.sample
index f1e0a56c26df..5cdf0efe027f 100644
--- a/devtools/Site/site.config.m4.sample
+++ b/devtools/Site/site.config.m4.sample
@@ -21,8 +21,7 @@ APPENDDEF(`confENVDEF', `-UNIS')
dnl #####################################################################
dnl ### ###
dnl ### The next group of statements illustrates how to add support ###
-dnl ### for a particular map class. If you have not heard of this ###
-dnl ### particular map type, then you probably don't need it. ###
+dnl ### for a particular map class.
dnl ### ###
dnl ### Note that the map define goes in confMAPDEF, and that any ###
dnl ### special library must be defined. Note, also that include ###
@@ -32,11 +31,11 @@ dnl ### search. ###
dnl ### ###
dnl #####################################################################
-dnl ### Changes for PH_MAP support.
-APPENDDEF(`confMAPDEF',`-DPH_MAP')
-APPENDDEF(`confLIBS', `-lphclient')
-APPENDDEF(`confINCDIRS', `-I/opt/nph/include')
-APPENDDEF(`confLIBDIRS', `-L/opt/nph/lib')
+dnl ### Changes for CDB support.
+APPENDDEF(`confMAPDEF',`-DCDB')
+APPENDDEF(`confLIBS', `-lcdb')
+APPENDDEF(`confINCDIRS', `-I/usr/local/include')
+APPENDDEF(`confLIBDIRS', `-L/usr/local/lib')
dnl #####################################################################
dnl ### ###
@@ -60,3 +59,14 @@ APPENDDEF(`confLIBS', `-lssl -lcrypto')
APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib -R/usr/local/ssl/lib')
APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include')
+dnl ### Example for SMTPUTF8 support
+dnl Note: the proper "International Components for Unicode"
+dnl must be installed. It's available under different names, e.g.,
+dnl OpenBSD: icu4c
+dnl FreeBSD, NetBSD, etc: icu
+dnl Centos, Fedora, RHEL: libicu-devel
+dnl Debian, Ubuntu: libicu-dev
+APPENDDEF(`confENVDEF',`-DUSE_EAI')
+APPENDDEF(`confLIBS', `-licuuc')
+dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/lib')
+dnl APPENDDEF(`confINCDIRS', `-I/usr/local/include')