Index: Apache-Test/lib/Apache/TestServer.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm,v
retrieving revision 1.60
diff -u -r1.60 TestServer.pm
--- Apache-Test/lib/Apache/TestServer.pm	1 Jul 2002 08:11:50 -0000	1.60
+++ Apache-Test/lib/Apache/TestServer.pm	4 Jul 2002 07:13:42 -0000
@@ -104,7 +104,7 @@
     #XXX: threaded mpm does not respond to SIGTERM with -DONE_PROCESS
     my $one = $self->{rev} == 1 ? '-X' : '';
     my $args = $self->args;
-    return "$self->{config}->{vars}->{httpd} $one $args";
+    return qq{"$self->{config}->{vars}->{httpd}" $one $args};
 }
 
 sub default_gdbinit {
@@ -139,7 +139,7 @@
 
     $config->genfile($file); #just mark for cleanup
 
-    my $command = "$strace_cmd $httpd $one_process $args";
+    my $command = "$strace_cmd \"$httpd\" $one_process $args";
 
     debug $command;
     system $command;
@@ -178,10 +178,10 @@
     my $httpd = $config->{vars}->{httpd};
 
     if ($debugger eq 'ddd') {
-        $command = qq{ddd --gdb --debugger "gdb -command $file" $httpd};
+        $command = qq{ddd --gdb --debugger "gdb -command $file" "$httpd"};
     }
     else {
-        $command = "gdb $httpd -command $file";
+        $command = qq{gdb "$httpd" -command $file};
     }
 
     $self->note_debugging;
Index: Apache-Test/lib/Apache/TestConfigParse.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm,v
retrieving revision 1.26
diff -u -r1.26 TestConfigParse.pm
--- Apache-Test/lib/Apache/TestConfigParse.pm	23 May 2002 17:26:38 -0000	1.26
+++ Apache-Test/lib/Apache/TestConfigParse.pm	4 Jul 2002 07:13:42 -0000
@@ -240,7 +240,7 @@
     my $httpd = $self->{vars}->{httpd};
     return unless $httpd;
 
-    my $cmd = "$httpd -l";
+    my $cmd = "\"$httpd\" -l";
     my $list = $self->open_cmd($cmd);
 
     while (<$list>) {
@@ -260,7 +260,7 @@
     my $httpd = $self->{vars}->{httpd};
     return unless $httpd;
 
-    my $cmd = "$httpd -V";
+    my $cmd = "\"$httpd\" -V";
     my $proc = $self->open_cmd($cmd);
 
     while (<$proc>) {
@@ -297,7 +297,7 @@
     return unless $httpd;
 
     my $version;
-    my $cmd = "$httpd -v";
+    my $cmd = "\"$httpd\" -v";
 
     my $v = $self->open_cmd($cmd);
 
Index: lib/Apache/Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.102
diff -u -r1.102 Build.pm
--- lib/Apache/Build.pm	23 Jun 2002 21:46:09 -0000	1.102
+++ lib/Apache/Build.pm	4 Jul 2002 07:13:43 -0000
@@ -936,7 +904,7 @@
 sub apache_libs_MSWin32 {
     my $self = shift;
     my $prefix = $self->apxs(-q => 'PREFIX');
-    my @libs = map { "$prefix/lib/lib$_.lib" } qw(apr aprutil httpd);
+    my @libs = map { "\"$prefix/lib/lib$_.lib\"" } qw(apr aprutil httpd);
     "@libs";
 }
 
@@ -950,7 +918,7 @@
 sub modperl_libs_MSWin32 {
     my $self = shift;
     #XXX: install/use mod_perl.lib for 3rd party xs modules
-    "$self->{cwd}/src/modules/perl/$self->{MP_LIBNAME}.lib";
+    "\"$self->{cwd}/src/modules/perl/$self->{MP_LIBNAME}.lib\"";
 }
 
 sub modperl_libs {
@@ -1149,7 +1117,7 @@
 }
 
 sub inc {
-    my @includes = map { "-I$_" } @{ shift->includes };
+    my @includes = map { "-I\"$_\"" } @{ shift->includes };
     "@includes";
 }
 
Index: xs/APR/APR/Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/APR/Makefile.PL,v
retrieving revision 1.4
diff -u -r1.4 Makefile.PL
--- xs/APR/APR/Makefile.PL	6 Apr 2002 04:42:00 -0000	1.4
+++ xs/APR/APR/Makefile.PL	4 Jul 2002 07:13:43 -0000
@@ -11,5 +11,5 @@
 ModPerl::MM::WriteMakefile(
     'NAME'	   => 'APR',
     'VERSION_FROM' => 'APR.pm',
-    'LIBS'         => ["-L$libdir @libs"],
+    'LIBS'         => ["-L\"$libdir\" @libs"],
 );