randyk 2003/07/22 22:07:12
Modified: . INSTALL Makefile.PL
win32 Configure.pl
Log:
Use top-level Makefile.PL for Win32 build, and adjust INSTALL
instructions to refelct this.
Revision Changes Path
1.6 +6 -7 httpd-apreq-2/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/INSTALL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- INSTALL 18 Jul 2003 18:38:38 -0000 1.5
+++ INSTALL 23 Jul 2003 05:07:11 -0000 1.6
@@ -44,10 +44,9 @@
Win32 build:
- C:\httpd-apreq-2> cd win32
- C:\httpd-apreq-2\win32> perl Configure.pl
- C:\httpd-apreq-2\win32> nmake
- C:\httpd-apreq-2\win32> nmake test
- C:\httpd-apreq-2\win32> nmake mod_apreq
- C:\httpd-apreq-2\win32> nmake perl_glue
- C:\httpd-apreq-2\win32> nmake perl_test
+ C:\httpd-apreq-2> perl Makefile.PL
+ C:\httpd-apreq-2> nmake
+ C:\httpd-apreq-2> nmake test
+ C:\httpd-apreq-2> nmake mod_apreq
+ C:\httpd-apreq-2> nmake perl_glue
+ C:\httpd-apreq-2> nmake perl_test
1.3 +19 -10 httpd-apreq-2/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.PL 22 Jul 2003 10:37:33 -0000 1.2
+++ Makefile.PL 23 Jul 2003 05:07:11 -0000 1.3
@@ -7,21 +7,30 @@
use Config;
use constant PERL_PATH => $Config{perlpath}; # XXX
+use constant WIN32 => ($^O =~ /Win32/);
-my @opts = qw(with-apache2-apxs with-perl);
-
-my %opts;
+if (WIN32) {
+ push @ARGV, '--with-perl=' . PERL_PATH;
+ my @args = (PERL_PATH, 'win32/Configure.pl', @ARGV);
+ print "@args\n";
+ system(@args) == 0 or die "system @args failed: $?";
+}
+else {
+ my @opts = qw(with-apache2-apxs with-perl);
+ my %opts;
+
# grab from @ARGV only the options that we expect
-GetOptions(\%opts, (map "$_=s", @opts));
+ GetOptions(\%opts, (map "$_=s", @opts));
-$opts{"with-perl"} = PERL_PATH;
+ $opts{"with-perl"} = PERL_PATH;
-my $opts = join " ", map {"--$_=$opts{$_}"} @opts;
+ my $opts = join " ", map {"--$_=$opts{$_}"} @opts;
-qx{./configure $opts};
+ qx{./configure $opts};
-push @ARGV, ('-apxs', $opts{"with-apache2-apxs"})
- if exists $opts{"with-apache2-apxs"};
+ push @ARGV, ('-apxs', $opts{"with-apache2-apxs"})
+ if exists $opts{"with-apache2-apxs"};
-qx{cd "glue/perl" && $opts{"with-perl"} Makefile.PL @ARGV};
+ qx{cd "glue/perl" && $opts{"with-perl"} Makefile.PL @ARGV};
+}
1.12 +3 -3 httpd-apreq-2/win32/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Configure.pl 21 Jul 2003 00:46:43 -0000 1.11
+++ Configure.pl 23 Jul 2003 05:07:12 -0000 1.12
@@ -111,9 +111,9 @@
Options:
--with-apache2=C:\Path\to\Apache2 : specify the top-level Apache2 directory
- --debug : build a debug version
- --without-perl : skip initializing the perl glue
- --help : print this help message
+ --debug : build a debug version
+ --without-perl : skip initializing the perl glue
+ --help : print this help message
With no options specified, an attempt will be made to find a suitable
Apache2 directory, and if found, a non-debug version will be built.
