dougm 01/06/21 09:11:48 Modified: . Changes INSTALL.win32 Makefile.PL Log: win32 enhancement: APACHE_SRC can be either the build or install tree Revision Changes Path 1.601 +3 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.600 retrieving revision 1.601 diff -u -r1.600 -r1.601 --- Changes 2001/06/19 02:36:40 1.600 +++ Changes 2001/06/21 16:11:40 1.601 @@ -10,6 +10,9 @@ =item 1.25_01-dev +win32 enhancement: APACHE_SRC can be either the build or install tree +[Randy Kobes <[EMAIL PROTECTED]>] + perl_destruct_level must always be 2 for DSO builds to prevent leaking on restarts, thanks to Paul G. Weiss for the spot 1.7 +4 -2 modperl/INSTALL.win32 Index: INSTALL.win32 =================================================================== RCS file: /home/cvs/modperl/INSTALL.win32,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- INSTALL.win32 2000/12/31 19:34:16 1.6 +++ INSTALL.win32 2001/06/21 16:11:42 1.7 @@ -117,8 +117,10 @@ =item APACHE_SRC -This gives the path to the Apache sources (eg, ..\apache_1.3.xx). It -is assumed that Apache has already been built in this directory. +This can be one of two values: either the path to the Apache build +directory (eg, ..\apache_1.3.xx), or to the installed Apache location +(eg, \Apache). This is used to set the locations of ApacheCore.lib +and the Apache header files. =item INSTALL_DLL 1.188 +16 -8 modperl/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/modperl/Makefile.PL,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- Makefile.PL 2001/06/19 03:12:41 1.187 +++ Makefile.PL 2001/06/21 16:11:43 1.188 @@ -2072,16 +2072,24 @@ unless ($win32_args{APACHE_SRC} = find_dir(\@dirs, 'apache source')); } $win32_args{APACHE_SRC} = win32_fix_path($win32_args{APACHE_SRC}); - $win32_args{APACHE_SRC} .= '/src' unless $win32_args{APACHE_SRC} =~ /src$/; - $win32_path{APACHE_INC} = $win32_args{APACHE_SRC} . '/include'; - $win32_args{APACHE_VERS} = httpd_version($win32_path{APACHE_INC}, 1); - $win32_path{APACHE_LIB} = ($win32_args{DEBUG} == 1) ? - $win32_args{APACHE_SRC} . - ($win32_args{APACHE_VERS} < 1315 ? '/CoreD' : '/Debug') : - $win32_args{APACHE_SRC} . - ($win32_args{APACHE_VERS} < 1315 ? '/CoreR' : '/Release'); + if (-d "$win32_args{APACHE_SRC}/libexec") { + $win32_path{APACHE_LIB} = $win32_args{APACHE_SRC} . '/libexec'; + $win32_path{APACHE_INC} = $win32_args{APACHE_SRC} . '/include'; + } + else { + $win32_args{APACHE_SRC} .= '/src' unless $win32_args{APACHE_SRC} =~ /src$/; + $win32_path{APACHE_INC} = $win32_args{APACHE_SRC} . '/include'; + $win32_args{APACHE_VERS} = httpd_version($win32_path{APACHE_INC}, 1); + $win32_path{APACHE_LIB} = ($win32_args{DEBUG} == 1) ? + $win32_args{APACHE_SRC} . + ($win32_args{APACHE_VERS} < 1315 ? '/CoreD' : '/Debug') : + $win32_args{APACHE_SRC} . + ($win32_args{APACHE_VERS} < 1315 ? '/CoreR' : '/Release'); + } die "Cannot find ApacheCore.lib under $win32_path{APACHE_LIB}\n" unless -f "$win32_path{APACHE_LIB}/ApacheCore.lib"; + die "Cannot find httpd.h under $win32_path{APACHE_INC}\n" + unless -f "$win32_path{APACHE_INC}/httpd.h"; if ($win32_args{INSTALL_DLL} ) { $win32_args{INSTALL_DLL} =