You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2003/10/17 16:49:12 UTC
cvs commit: httpd-apreq-2/glue Makefile.am
joes 2003/10/17 07:49:12
Modified: . Makefile.PL
glue Makefile.am
Log:
Makefile.PL cleanups to ensure --enable... args are passed correctly to configure. Also make sure perl glue gets cleaned up on 'make clean'.
Revision Changes Path
1.5 +11 -8 httpd-apreq-2/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/Makefile.PL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.PL 17 Oct 2003 06:27:20 -0000 1.4
+++ Makefile.PL 17 Oct 2003 14:49:12 -0000 1.5
@@ -16,19 +16,22 @@
system(@args) == 0 or die "system @args failed: $?";
}
else {
- my @opts = qw(with-apache2-apxs with-perl with-apache2-src
+ my @opts = qw(with-apache2-apxs with-apache2-src
with-apr-config with-apu-config);
+ my @flags = qw/enable-maintainer-mode enable-perl-glue disable-perl-glue/;
my %opts;
-
# grab from @ARGV only the options that we expect
- GetOptions(\%opts, (map "$_=s", @opts),
- qw/enable-maintainer-mode enable-perl-glue disable-perl-glue/);
+ GetOptions(\%opts, (map "$_=s", @opts), @flags);
$opts{"with-perl"} = PERL_PATH;
- $opts{"enable-perl-glue"} = "on" unless
- exists $opts{"disable-perl-glue"} or exists $opts{"enable-perl-glue"};
+ my $opts = "";
+ $opts .= "--enable-maintainer-mode " if $opts{"enable-maintainer-mode"};
+ $opts .= "--enable-perl-glue " unless exists $opts{"disable-perl-glue"};
- my $opts = join " ", map {"--$_=$opts{$_}"} keys %opts;
- exec "./configure --enable-perl-glue $opts";
+ delete @opts{@flags};
+
+ $opts .= join " ", map {"--$_=$opts{$_}"} keys %opts;
+ print "./configure $opts\n";
+ exec "./configure $opts";
}
1.2 +5 -0 httpd-apreq-2/glue/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 17 Oct 2003 06:27:20 -0000 1.1
+++ Makefile.am 17 Oct 2003 14:49:12 -0000 1.2
@@ -19,11 +19,16 @@
perl_install:
cd perl; make install
+perl_clean:
+ cd perl; make clean
+
if BUILD_PERL_GLUE
all-local: perl_glue
install-exec-local: perl_install
+
+clean-local: perl_clean
test: perl_test