----- Original Message -----
From: "Doug MacEachern" <[EMAIL PROTECTED]>
To: "Randy Kobes" <[EMAIL PROTECTED]>
Cc: <[EMAIL PROTECTED]>
Sent: Monday, July 09, 2001 10:06 AM
Subject: Re: ModuleConfig on Win32
> On Mon, 9 Jul 2001, Randy Kobes wrote:
>
> > Hi,
> > I've attached a diff for Win32 against the current cvs
> > mod_perl that does three things ....
>
> cool, thanks randy, applied to cvs.
thanks ... could I bother you for a couple more
small changes? In enabling the Apache::src test,
I didn't check properly that it would be skipped if
mod_perl.so was built thru Visual Studio - this diff:
*************************************************************************
Index: src.t
===================================================================
RCS file: /home/cvspublic/modperl/t/modules/src.t,v
retrieving revision 1.3
diff -u -r1.3 src.t
--- src.t 2001/07/09 15:03:25 1.3
+++ src.t 2001/07/10 05:49:36
@@ -5,7 +5,7 @@
my $i = 0;
-# skip_test if WIN32;
+skip_test if (WIN32 and !Apache::src->mmn_eq);
print "1..6\n";
*************************************************************************
corrects that - t/modules/src.t is skipped on Win32
if mod_perl.so is built with Visual Studio, and is run
successfully if the build is done with specifying APACHE_SRC
at the 'perl Makefile.PL' stage. The second tweak is
to the top-level Makefile.PL:
*************************************************************************
Index: Makefile.PL
===================================================================
RCS file: /home/cvspublic/modperl/Makefile.PL,v
retrieving revision 1.191
diff -u -r1.191 Makefile.PL
--- Makefile.PL 2001/07/09 15:03:06 1.191
+++ Makefile.PL 2001/07/10 06:29:04
@@ -358,8 +358,9 @@
if ($vcpp and $win32_args{APACHE_SRC}) {
$EVERYTHING = 1;
my $fixed_apsrc = win32_fix_path($win32_args{APACHE_SRC});
- $APACHE_SRC = -d "$fixed_apsrc/include" ?
- $fixed_apsrc : $fixed_apsrc . '/src';
+ $APACHE_SRC = -d "$fixed_apsrc/include" ? $fixed_apsrc :
+ (-d "$fixed_apsrc/src/include" ? $fixed_apsrc . '/src' :
+ die "Cannot find the Apache include directory under $fixed_apsrc");
$win32_auto = 1;
}
*************************************************************************
which confirms early on that if APACHE_SRC is specified that
the Apache include/ directory can be found. With the way I had
it before, if an APACHE_SRC was given that didn't have an
include/ directory, the build would die saying that Apache 1.3
was needed, which is confusing if someone had simply
mistyped a value for APACHE_SRC.
best regards,
randy
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
