[Scoop-checkins] scoop/etc startup.pl

[scoop at lithium.sabren.com]

Update of /cvs/scoop/scoop/etc
In directory lithium.sabren.com:/tmp/cvs-serv22167/etc

Modified Files:
	startup.pl 
Log Message:
Fix for bug #173 from Janra and Captain_Tenille --hulver


Index: startup.pl
===================================================================
RCS file: /cvs/scoop/scoop/etc/startup.pl,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** startup.pl	27 Jan 2005 22:40:03 -0000	1.70
--- startup.pl	26 May 2005 11:02:21 -0000	1.71
***************
*** 2,5 ****
--- 2,11 ----
  use strict;
  use mod_perl ();
+ #BEGIN {
+ #	eval "use mod_perl ()";
+ #}
+ #BEGIN {
+ #	eval "use mod_perl2 ()";
+ #}
  
  # first off, check the mod_perl version, so we can change what we pull in
***************
*** 8,11 ****
--- 14,18 ----
  BEGIN {
  	$Scoop::MP2 = $mod_perl::VERSION >= 1.99 ? 1 : 0;
+ 	#$Scoop::MP2 = 1;
  }
  
***************
*** 61,69 ****
  if ($Scoop::MP2) {
  	eval "
! 		use Apache::RequestRec;
! 		use Apache::RequestIO;
! 		use Apache::Connection;
! 		use Apache::RequestUtil;
! 		use Apache::Const;
  	";
  } else {
--- 68,76 ----
  if ($Scoop::MP2) {
  	eval "
! 		use Apache2::RequestRec;
! 		use Apache2::RequestIO;
! 		use Apache2::Connection;
! 		use Apache2::RequestUtil;
! 		use Apache2::Const;
  	";
  } else {