[LON-CAPA-cvs] cvs: loncom / startup.pl

[albertel]

albertel		Tue Sep 16 15:53:33 2003 EDT

  Modified files:              
    /loncom	startup.pl 
  Log:
  - this is really starting to yank my gourd.
  - should now try loading both and one of them should succeed, 
  
  
Index: loncom/startup.pl
diff -u loncom/startup.pl:1.15 loncom/startup.pl:1.16
--- loncom/startup.pl:1.15	Tue Sep 16 11:12:48 2003
+++ loncom/startup.pl	Tue Sep 16 15:53:33 2003
@@ -1,10 +1,9 @@
 #!/usr/bin/perl
 
-if ($mod_perl::VERSION > 1.99) {
-    use Apache::compat();
-} else {
-    use Apache();
-}
+BEGIN {
+    eval "use Apache::compat();";
+    eval "use Apache();";
+};
 use lib '/home/httpd/lib/perl';
 #use lib '/usr/lib/perl5/site_perl/5.005/';
 use lib '/usr/lib/perl5/site_perl/5.6.0/i386-linux/';