* 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.

17 files changed, 62 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index dcb918f1..2fec6e34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ c-client.d:
 
 c-client:
 	$(C_CLIENT_WITH_IPV6)
-	cd imap && $(MAKE) $(C_CLIENT_TARGET) $(C_CLIENT_CFLAGS) $(C_CLIENT_LDFLAGS) $(C_CLIENT_GCCOPTLEVEL) EXTRAAUTHENTICATORS="$(C_CLIENT_AUTHS)" EXTRASPECIALS="$(C_CLIENT_SPECIALS)"
+	cd imap && $(MAKE) $(C_CLIENT_TARGET) $(C_CLIENT_CFLAGS) $(C_CLIENT_LDFLAGS) $(C_CLIENT_GCCOPTLEVEL) EXTRAAUTHENTICATORS="$(C_CLIENT_AUTHS)" EXTRASPECIALS="$(C_CLIENT_SPECIALS)" BUNDLED="$(C_CLIENT_BUNDLED)"
 
 gssapi_proxy.l:
 	if test ! -L c-client/auth_gss_proxy.c ; then $(LN_S) @abs_top_srcdir@/web/src/pubcookie/auth_gss_proxy.c c-client/auth_gss_proxy.c ; fi
diff --git a/Makefile.in b/Makefile.in
index 15c893e5..a41bdfa5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -267,6 +267,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
@@ -955,7 +956,7 @@ c-client.d:
 
 c-client:
 	$(C_CLIENT_WITH_IPV6)
-	cd imap && $(MAKE) $(C_CLIENT_TARGET) $(C_CLIENT_CFLAGS) $(C_CLIENT_LDFLAGS) $(C_CLIENT_GCCOPTLEVEL) EXTRAAUTHENTICATORS="$(C_CLIENT_AUTHS)" EXTRASPECIALS="$(C_CLIENT_SPECIALS)"
+	cd imap && $(MAKE) $(C_CLIENT_TARGET) $(C_CLIENT_CFLAGS) $(C_CLIENT_LDFLAGS) $(C_CLIENT_GCCOPTLEVEL) EXTRAAUTHENTICATORS="$(C_CLIENT_AUTHS)" EXTRASPECIALS="$(C_CLIENT_SPECIALS)" BUNDLED="$(C_CLIENT_BUNDLED)"
 
 gssapi_proxy.l:
 	if test ! -L c-client/auth_gss_proxy.c ; then $(LN_S) @abs_top_srcdir@/web/src/pubcookie/auth_gss_proxy.c c-client/auth_gss_proxy.c ; fi
diff --git a/alpine/Makefile.in b/alpine/Makefile.in
index ac53e0f1..80a6faa4 100644
--- a/alpine/Makefile.in
+++ b/alpine/Makefile.in
@@ -269,6 +269,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/alpine/osdep/Makefile.in b/alpine/osdep/Makefile.in
index 8d2ae069..a9659691 100644
--- a/alpine/osdep/Makefile.in
+++ b/alpine/osdep/Makefile.in
@@ -213,6 +213,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/configure b/configure
index b945d3ba..269eff8e 100755
--- a/configure
+++ b/configure
@@ -657,6 +657,7 @@ PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
 acx_pthread_config
+C_CLIENT_BUNDLED
 alpine_interactive_spellcheck
 ISPELLPROG
 alpine_simple_spellcheck
@@ -829,6 +830,7 @@ with_libiconv_prefix
 with_libintl_prefix
 enable_dmalloc
 with_dmalloc_dir
+with_bundled_tools
 with_date_stamp
 with_host_stamp
 with_ps_cmd
@@ -1605,6 +1607,8 @@ Optional Packages:
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
   --with-dmalloc-dir=DIR  Root of dmalloc lib/include path
+  --with-bundled-tools    Build additional tools (mtest, imapd, etc.) Default:
+                          --with-bundled-tools=no
   --with-date-stamp=DATE  Set this as the date this program was built.
                           Default: output of `date`
   --with-host-stamp=HOST  Set name of computer for compilation. Default:
@@ -15214,6 +15218,18 @@ $as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
 
 fi
 
+alpine_c_client_bundled="no"
+
+# Check whether --with-bundled-tools was given.
+if test "${with_bundled_tools+set}" = set; then :
+  withval=$with_bundled_tools;
+    if test "x$withval" = "xyes" ; then
+     alpine_c_client_bundled=""
+    fi
+
+fi
+
+
 ALPINE_datestamp=`date`
 
 # Check whether --with-date-stamp was given.
@@ -19116,8 +19132,9 @@ $as_echo "#define ENABLE_LDAP /**/" >>confdefs.h
   fi
 fi
 
-if test "x$alpine_PAM" != "xnone" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pam_start" >&5
+if test -z "$alpine_c_client_bundled" ; then
+  if test "x$alpine_PAM" != "xnone" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pam_start" >&5
 $as_echo_n "checking for library containing pam_start... " >&6; }
 if ${ac_cv_search_pam_start+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -19208,9 +19225,11 @@ else
 fi
 
     if test -n "$alpine_pam_none_reason" ; then
-      as_fn_error $? "No PAM support: $alpine_pam_none_reason" "$LINENO" 5
+       as_fn_error or do not use --with-bundled-tools "Trying to build bundled tools but could not find libpam. Install it first and try again" "$LINENO" 5
+    fi
   fi
 fi
+C_CLIENT_BUNDLED=$alpine_c_client_bundled
 
 
 if test "x$alpine_GSSTYPE" != "xnone" ; then
diff --git a/configure.ac b/configure.ac
index 71672a35..d6e1e701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,16 @@ if test x$enable_dmalloc = "xyes" ; then
   AC_DEFINE(ENABLE_DMALLOC, 1, [Define enable dmalloc debugging])
 fi
 
+dnl Do not build bundled tools (Default)
+alpine_c_client_bundled="no"
+AC_ARG_WITH(bundled-tools,
+  AS_HELP_STRING([--with-bundled-tools],[ Build additional tools (mtest, imapd, etc.) Default: --with-bundled-tools=no]),
+  [ 
+    if test "x$withval" = "xyes" ; then
+     alpine_c_client_bundled=""
+    fi
+  ])
+
 dnl set date and hostname
 ALPINE_datestamp=`date`
 AC_ARG_WITH(date-stamp,
@@ -1613,8 +1623,9 @@ if test "$alpine_with_ldap" = "yes" ; then
 fi
 
 dnl PAM support is needed to build c-client in some linux, and hence Alpine.
-if test "x$alpine_PAM" != "xnone" ; then
-  AC_SEARCH_LIBS(pam_start,pam,
+if test -z "$alpine_c_client_bundled" ; then
+  if test "x$alpine_PAM" != "xnone" ; then
+     AC_SEARCH_LIBS(pam_start,pam,
       [
 	LIBS="$LIBS -lpam"
 	AC_CHECK_HEADER([security/pam_appl.h],
@@ -1641,10 +1652,11 @@ if test "x$alpine_PAM" != "xnone" ; then
 	alpine_pam_none_reason="library files not found"
       ])
     if test -n "$alpine_pam_none_reason" ; then
-      AC_MSG_ERROR(No PAM support: $alpine_pam_none_reason)
+       AC_MSG_ERROR(Trying to build bundled tools but could not find libpam. Install it first and try again, or do not use --with-bundled-tools)
+    fi
   fi
 fi
-
+AC_SUBST([C_CLIENT_BUNDLED], $alpine_c_client_bundled)
 
 dnl provide KRB5 support?
 if test "x$alpine_GSSTYPE" != "xnone" ; then
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)
diff --git a/m4/Makefile.in b/m4/Makefile.in
index b85a14ea..49180710 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -143,6 +143,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/pico/Makefile.in b/pico/Makefile.in
index cd0b94c9..24ab1bd1 100644
--- a/pico/Makefile.in
+++ b/pico/Makefile.in
@@ -267,6 +267,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/pico/osdep/Makefile.in b/pico/osdep/Makefile.in
index b3896b7c..c35f9ff5 100644
--- a/pico/osdep/Makefile.in
+++ b/pico/osdep/Makefile.in
@@ -214,6 +214,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/pith/Makefile.in b/pith/Makefile.in
index 64b9a464..2c25fd1c 100644
--- a/pith/Makefile.in
+++ b/pith/Makefile.in
@@ -283,6 +283,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/pith/charconv/Makefile.in b/pith/charconv/Makefile.in
index 56c3445c..834036a5 100644
--- a/pith/charconv/Makefile.in
+++ b/pith/charconv/Makefile.in
@@ -210,6 +210,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/pith/osdep/Makefile.in b/pith/osdep/Makefile.in
index c30e3712..2a2f3046 100644
--- a/pith/osdep/Makefile.in
+++ b/pith/osdep/Makefile.in
@@ -217,6 +217,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/pith/pine.hlp b/pith/pine.hlp
index fa86722e..a101e9fe 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 376 2019-11-22 17:41:21
+Alpine Commit 377 2019-11-23 22:02:58
 ============= h_news =================
 <HTML>
 <HEAD>
diff --git a/web/src/Makefile.in b/web/src/Makefile.in
index 9a929dbc..3dd88e35 100644
--- a/web/src/Makefile.in
+++ b/web/src/Makefile.in
@@ -154,6 +154,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/web/src/alpined.d/Makefile.in b/web/src/alpined.d/Makefile.in
index 95b64fec..9238bb02 100644
--- a/web/src/alpined.d/Makefile.in
+++ b/web/src/alpined.d/Makefile.in
@@ -256,6 +256,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@
diff --git a/web/src/pubcookie/Makefile.in b/web/src/pubcookie/Makefile.in
index 322b84bf..2c685652 100644
--- a/web/src/pubcookie/Makefile.in
+++ b/web/src/pubcookie/Makefile.in
@@ -233,6 +233,7 @@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
+C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
 C_CLIENT_CFLAGS = @C_CLIENT_CFLAGS@
 C_CLIENT_GCCOPTLEVEL = @C_CLIENT_GCCOPTLEVEL@
 C_CLIENT_LDFLAGS = @C_CLIENT_LDFLAGS@