svn commit: rev 6101 - in incubator/spamassassin/trunk: build spamd

[ms...@apache.org]

Author: mss
Date: Tue Jan  6 13:21:15 2004
New Revision: 6101

Modified:
   incubator/spamassassin/trunk/build/configure
   incubator/spamassassin/trunk/spamd/binaries.mk.win
Log:
Some Native Windows fixes.


Modified: incubator/spamassassin/trunk/build/configure
==============================================================================
--- incubator/spamassassin/trunk/build/configure	(original)
+++ incubator/spamassassin/trunk/build/configure	Tue Jan  6 13:21:15 2004
@@ -6,8 +6,8 @@
 use warnings;
 use Config;
 
-use File::Spec;
 use File::Copy;
+use File::Spec::Functions;
 
 use Cwd qw(chdir);
 
@@ -43,7 +43,7 @@
 
 
 # On everything but native Windows (!= cygwin) we use autoconf.
-unless (RUNNING_ON_NATIVE_WINDOWS)
+unless (!RUNNING_ON_NATIVE_WINDOWS)
 {
   print join(' ', @args) . "\n";
   exec @args;
@@ -58,11 +58,14 @@
     CFLAGS         => '/DWIN32',
     SSLCFLAGS      => '/DSPAMC_SSL',
 
+    MAKEFILE       => 'binaries.mk',
+    SRCDIR         => $args{srcdir},
+
     LIBS           => 'ws32.lib',
     SSLLIBS        => 'ssleay32.lib libeay32.lib',
 
-    SPAMC_FILES    => 'spamd/spamc.c spamd/getopt.c',
-    LIBSPAMC_FILES => 'spamd/libspamc.c spamd/utils.c',
+    SPAMC_FILES    => 'spamc.c getopt.c',
+    LIBSPAMC_FILES => 'libspamc.c utils.c',
   );
 
   # Enable SSL only if requested.
@@ -84,7 +87,7 @@
   # Note that variables are enclosed by *two* @s while autoconf uses only
   # one.
   @args = (
-    File::Spec->catfile(File::Spec->updir(), 'build', 'preprocessor'),
+    catfile(updir(), 'build', 'preprocessor'),
     q{-Mvars},
     q{-ibinaries.mk.win},
     q{-obinaries.mk}

Modified: incubator/spamassassin/trunk/spamd/binaries.mk.win
==============================================================================
--- incubator/spamassassin/trunk/spamd/binaries.mk.win	(original)
+++ incubator/spamassassin/trunk/spamd/binaries.mk.win	Tue Jan  6 13:21:15 2004
@@ -2,6 +2,9 @@
 CFLAGS = @@CFLAGS@@
 SSLCFLAGS = @@SSLCFLAGS@@
 
+SRCDIR = @@SRCDIR@@
+MAKEFILE = @@MAKEFILE@@
+
 LIBS = @@LIBS@@
 SSLLIBS = @@SSLLIBS@@
 
@@ -9,9 +12,14 @@
 LIBSPAMC_FILES = @@LIBSPAMC_FILES@@
 
 
-all: spamd/spamc.exe
+all: spamc.exe
+
+
+$(SRCDIR)/spamc.exe:
+	cd $(SRCDIR)
+	make -f $(MAKEFILE) spamc.exe
+
 
-spamd/spamc.exe: $(SPAMC_FILES) $(LIBSPAMC_FILES)
-	cd spamd
+spamc.exe: $(SPAMC_FILES) $(LIBSPAMC_FILES)
 	$(CC) $(SSLCFLAGS) $(CFLAGS) $(SPAMC_FILES) $(LIBSPAMC_FILES) $(LIBS) $(SSLLIBS)