From 4eb332a074f8c26df251d782fe0439bc8c85f7ce Mon Sep 17 00:00:00 2001
From: Mike Heins <mike@perusion.com>
Date: Tue, 19 Dec 2000 10:02:12 +0000
Subject: [PATCH]   * Added check for not being able to determine current
 directory     (non readable parent path) and ask for information.

  * Fixed BSD hints so that it changes all instances of MaxServers
    to 0.
---
 Makefile.PL | 32 ++++++++++++++++++++++++++++++--
 hints.pl    |  4 ++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 2caf736c3..61cfe8f44 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,10 +1,13 @@
 use ExtUtils::MakeMaker;
 require ExtUtils::Install;
 
+my $changed_dir_initially;
+
 BEGIN {
 	eval {
 		require FindBin;
-		chdir $FindBin::RealBin;
+		chdir $FindBin::RealBin
+			and $changed_dir_initially = 1;
 	};
 }
 
@@ -48,7 +51,27 @@ my @chown_files = qw/
 use lib './lib';
 
 
-my $origdir = cwd();
+my $origdir;
+if ($changed_dir_initially) {
+	$origdir = cwd();
+}
+elsif($ENV{PWD}) {
+	## We will try
+	$origdir = $ENV{PWD};
+}
+else {
+	print <<EOF;
+We know this sounds dumb, but we need to know the current directory. Your
+system administratory appears to have set up your system so that you cannot
+search the directory path above you. Were you to ever change directory
+to /tmp or something, you couldn't even walk the tree back to your own
+directory.
+
+EOF
+
+	$origdir = my_prompt(qq{What is the directory you are in currently? });
+
+}
 
 # See if we have Term::ReadLine::Perl
 eval {
@@ -57,6 +80,7 @@ eval {
 		require Term::ReadKey;
 		$TermRead = 1;
 };
+
 unless($@) {
 	$ENV{PERL_RL} = 'Perl';
 }
@@ -770,6 +794,10 @@ EOF
 	GetOptions(\%optctl, @options)
 		or die "Bad option get\n";
 
+	if($MV::Default{PREFIX} and ! $changed_dir_initially) {
+		$origdir = cwd();
+	}
+
 #	use Data::Dumper;
 #	$Data::Dumper::Terse = $Data::Dumper::Indent = 2;
 #	print "ARGV: " . Dumper(\@ARGV);
diff --git a/hints.pl b/hints.pl
index 0cdefb23a..573084bd2 100644
--- a/hints.pl
+++ b/hints.pl
@@ -19,10 +19,10 @@ sub get_hints {
 		while(<HINTIN>) {
 			s/
 				^\s*Housekeeping\s+\d+.*$
-			/# Changed for $^O, no safe signals\nHousekeeping 1/xi;
+			/# Changed for $^O, no safe signals\nHousekeeping 1/xig;
 			s/
 				^\s*MaxServers\s+\d+.*$
-			/# Changed for $^O, no safe signals\nMaxServers 0/xi;
+			/# Changed for $^O, no safe signals\nMaxServers 0/xig;
 			print HINTOUT $_;
 		}
 		close HINTIN;