From be556aa57bf6f283afb00cfbbcd02cb794965d2d Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Sat, 23 Nov 2019 22:03:03 -0700 Subject: * Change in build process. Now Alpine will not build the imap tools by default. In order to build the imap tools (such as mtest, imapd, etc.) the configure script must be given the --with-bundled-tools option. Similarly, libpam is not required anymore, unless the option --with-bundled-tools is used. --- imap/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'imap') diff --git a/imap/Makefile b/imap/Makefile index c98d48dd..9e6a3327 100644 --- a/imap/Makefile +++ b/imap/Makefile @@ -266,6 +266,7 @@ EXTRALDFLAGS= EXTRASPECIALS= SPECIALS= +BUNDLED= # Normal commands @@ -290,12 +291,12 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRACFLAGS)'\ EXTRADRIVERS='$(EXTRADRIVERS)'\ EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\ PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)\ - EXTRASPECIALS='$(EXTRASPECIALS)' + EXTRASPECIALS='$(EXTRASPECIALS)' BUNDLED='$(BUNDLED)' # Make the IMAP Toolkit -all: c-client SPECIALS rebuild bundled +all: c-client SPECIALS rebuild bundled$(BUNDLED) c-client: @echo Not processed yet. In a first-time build, you must specify @@ -684,7 +685,7 @@ an ua: $(TOOLS)/$@ "$(LN)" src/tmail tmail $(LN) $(TOOLS)/$@ . -build: OSTYPE rebuild rebuildclean bundled +build: OSTYPE rebuild rebuildclean bundled$(BUNDLED) OSTYPE: @$(MAKE) ip$(IP) @@ -696,7 +697,7 @@ OSTYPE: EXTRADRIVERS='$(EXTRADRIVERS)'\ EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\ PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)\ - $(SPECIALS) $(EXTRASPECIALS) + $(SPECIALS) $(EXTRASPECIALS) BUNDLED='$(BUNDLED)' echo $(BUILDTYPE) > OSTYPE $(TOUCH) rebuild @@ -710,8 +711,12 @@ rebuild: rebuildclean: $(SH) -c '$(RM) rebuild || true' +bundledno: + @echo Not building bundled tools. + bundled: @echo Building bundled tools... + @echo BUNDLED=$(BUNDLED) $(CD) mtest;$(MAKE) $(CD) ipopd;$(MAKE) $(CD) imapd;$(MAKE) -- cgit v1.2.3-54-g00ecf