You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by as...@hyperreal.org on 1998/08/26 04:52:42 UTC
cvs commit: modperl Changes Makefile.PL ToDo
ask 98/08/25 19:52:42
Modified: . Changes Makefile.PL ToDo
Log:
Removed use of Term::ReadLine in Makefile.PL
Revision Changes Path
1.115 +4 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- Changes 1998/08/26 01:47:10 1.114
+++ Changes 1998/08/26 02:52:40 1.115
@@ -8,6 +8,10 @@
=item 1.15_01-dev
+removed use of Term::ReadLine in Makefile.PL to make it work on
+systems with broken Term::ReadLines installed.
+[Ask Bjoern Hansen <as...@netcetera.dk>]
+
fix Makefile.PL and Apache::src to find MODULE_MAGIC_NUMBER in ap_mmn.h
if PERL_DESTRUCT_LEVEL < 0, skip perl_destruct(), etc. in perl_shutdown()
1.85 +6 -49 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Makefile.PL 1998/08/26 01:47:10 1.84
+++ Makefile.PL 1998/08/26 02:52:40 1.85
@@ -53,7 +53,7 @@
close FH;
}
-use subs qw(_prompt iedit asrc);
+use subs qw(iedit asrc);
gen_script("t/net/perl/cgi.pl");
gen_script("t/report");
@@ -69,10 +69,6 @@
sleep(1);
}
-unless ($Is_Win32) {
- readline_setup();
-}
-
%Apache::MyConfig::Setup = ();
eval 'require Apache::MyConfig' ;
@@ -362,7 +358,7 @@
print "Enter `q' to stop search\n";
while(1) {
print "Please tell me where I can find your apache src\n" ;
- $src_dir = _prompt("", $APACHE_SRC_DEFAULT);
+ $src_dir = prompt("", $APACHE_SRC_DEFAULT);
last if $src_dir eq "q";
if(-d $src_dir) {
push(@adirs, $src_dir);
@@ -384,7 +380,7 @@
if (-e $httpd_h) {
unless($NO_HTTPD and not $DYNAMIC and not $PREP_HTTPD) {
unless($DO_HTTPD) {
- $ans = _prompt("Configure mod_perl with $adir ?", "y");
+ $ans = prompt("Configure mod_perl with $adir ?", "y");
next unless $ans =~ /^y$/i;
}
$APACHE_SRC = $adir;
@@ -409,7 +405,7 @@
$cant_hook{PERL_SSI} = "(doesn't work w/ USE_DSO=1)";
}
unless ($DO_HTTPD or $NO_HTTPD) {
- $ans = _prompt("Shall I build httpd in $adir for you?", "y");
+ $ans = prompt("Shall I build httpd in $adir for you?", "y");
++$NO_HTTPD, ++$PREP_HTTPD unless $ans =~ /^y$/i;
}
@@ -778,8 +774,8 @@
}
if($User eq "root") {
print "Cannot run tests as User `$User'\n";
- $User = _prompt("Which User?", "nobody");
- $Group = _prompt("Which Group?", $Group);
+ $User = prompt("Which User?", "nobody");
+ $Group = prompt("Which Group?", $Group);
}
print STDERR "Will run tests as User: '$User' Group: '$Group'\n";
@@ -1464,45 +1460,6 @@
warn "$module name guess might be incorrect";
}
return (keys %seen)[0];
-}
-
-sub readline_setup {
- local $^W = 0;
- eval 'use Term::ReadLine' ;
-
- if ($@ eq '') {
- $::term = new Term::ReadLine 'mod_perl install';
-
- eval {
- sub main::_prompt {
- my ($prompt, $default) = @_ ;
-
- $_ = $::term -> readline ("$prompt [$default] ") ;
- if (!/^\s*$/) {
- s/\s+$//;
- return $_ ;
- }
- else {
- if ($_ eq "") {
- return $default ;
- }
- else {
- return "" ;
- }
- }
- }
- };
- die $@ if $@;
- print "ReadLine support enabled\n" ;
- }
- else {
- eval <<'EOT' ;
-
- sub main::_prompt {
- prompt($_[0], $_[1]);
- }
-EOT
- }
}
sub asrc {
1.66 +0 -2 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /home/cvs/modperl/ToDo,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ToDo 1998/08/25 19:26:31 1.65
+++ ToDo 1998/08/26 02:52:41 1.66
@@ -10,8 +10,6 @@
- sfio/solaris problem
Lupe Christoph <lu...@alanya.m.isar.de>, Don Hayward <do...@mote.org>
-- get rid of Term::ReadLine in Makefile.PL
-
- ap_log_error -> ap_log_rerror
- Apache::Constants :override :args_how