svn commit: r1713709 - in /spamassassin/branches/3.4: Makefile.PL spamc/README.win

[jq...@apache.org]

Author: jquinn
Date: Tue Nov 10 18:15:48 2015
New Revision: 1713709

URL: http://svn.apache.org/viewvc?rev=1713709&view=rev
Log:
Windows option to enable building spamd

Modified:
    spamassassin/branches/3.4/Makefile.PL
    spamassassin/branches/3.4/spamc/README.win

Modified: spamassassin/branches/3.4/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/Makefile.PL?rev=1713709&r1=1713708&r2=1713709&view=diff
==============================================================================
--- spamassassin/branches/3.4/Makefile.PL (original)
+++ spamassassin/branches/3.4/Makefile.PL Tue Nov 10 18:15:48 2015
@@ -72,6 +72,7 @@ my @ATT_KEYS = (
 
 
   'BUILD_SPAMC'  ,    # Set to 'no' to skip build of spamc.
+  'BUILD_SPAMD',      # Set to 'no' to skip build of spamd.
   'ENABLE_SSL',       # Set to 'yes' to build spamc with SSL support.
   'CONTACT_ADDRESS',  # To not ask for the contact address, use this.
 );
@@ -105,6 +106,7 @@ sub yesno {
 
 my %opt = (
   'build_spamc'     => undef,
+  'build_spamd'     => undef,
   'enable_ssl'      => undef,
   'contact_address' => undef,
   'destdir'         => undef,
@@ -267,9 +269,19 @@ unless($Config{installman1dir}
 
 # Windows platforms need some adjustments
 if (RUNNING_ON_WINDOWS) {
-  # Don't build spamd
-  delete $makefile{EXE_FILES}{'spamd/spamd.raw'};
-  delete $makefile{MAN1PODS}{'spamd/spamd'};
+  # Building spamd is optional on Windows because it still is somewhat
+  # experimental.
+  if (!defined $opt{'build_spamd'}) {
+    $opt{'build_spamd'} = bool(prompt(
+      "Build spamd.exe (experimental on windows platforms)? (y/n)",
+      'n'));
+  } else {
+    $opt{'build_spamd'} = bool($opt{'build_spamd'});
+  }
+  if (!$opt{'build_spamd'}) {
+    delete $makefile{EXE_FILES}{'spamd/spamd.raw'};
+    delete $makefile{MAN1PODS}{'spamd/spamd'};
+  }
   # building spamc is optional under Win32 because not everyone has compiler
   if (!defined $opt{'build_spamc'}) {
     $opt{'build_spamc'} = bool(prompt(

Modified: spamassassin/branches/3.4/spamc/README.win
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamc/README.win?rev=1713709&r1=1713708&r2=1713709&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamc/README.win (original)
+++ spamassassin/branches/3.4/spamc/README.win Tue Nov 10 18:15:48 2015
@@ -3,7 +3,11 @@ Building spamd/spamc under Windows
 
 Spamd currently does not run under Windows, but spamc does.
 
-Spamd does work when built and run in the Cygwin unix emulation
+With SpamAssassin 3.3.2, spamd has been made available for Windows. Note
+that this is still experimental. In terms of stability and perfomance it
+heavily depends on which Perl distribution and/or module versions you
+are using. So do not use it in a production environment. Alternatively,
+spamd also works when built and run in the Cygwin Unix emulation
 environment, and a pure Windows spamc can be used with it. You can also
 run a pure Windows spamc that communicates with spamd running on any
 network accessible computer. The unix sockets option is not supported
@@ -27,8 +31,7 @@ suitable C compiler.
 
 To build SpamAssassin you must have installed a Windows version of Perl
 and the modules that are listed as required in the general SpamAssassin
-documentation. So far the only Windows version of perl this has been
-tested with is ActivePerl.
+documentation.
 
 Building spamc for Windows has been tested with Microsoft Visual C++ 6.0
 and with Microsoft Visual C++ Toolkit 2003. It will probably just work