Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 13453 invoked from network); 18 Sep 2004 22:18:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 18 Sep 2004 22:18:08 -0000 Received: (qmail 84553 invoked by uid 500); 18 Sep 2004 22:18:08 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 84498 invoked by uid 500); 18 Sep 2004 22:18:07 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@perl.apache.org Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 84478 invoked by uid 500); 18 Sep 2004 22:18:07 -0000 Delivered-To: apmail-modperl-2.0-cvs@apache.org X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Date: 18 Sep 2004 22:18:01 -0000 Message-ID: <20040918221801.13371.qmail@minotaur.apache.org> From: gozer@apache.org To: modperl-2.0-cvs@apache.org Subject: cvs commit: modperl-2.0/lib/ModPerl BuildOptions.pm X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N gozer 2004/09/18 15:18:00 Modified: . Changes lib/Apache Build.pm lib/ModPerl BuildOptions.pm Log: MP_AP_BUILD configure option removed. Now implicit when MP_USE_STATIC is specified. Revision Changes Path 1.488 +3 -0 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.487 retrieving revision 1.488 diff -u -r1.487 -r1.488 --- Changes 17 Sep 2004 00:07:24 -0000 1.487 +++ Changes 18 Sep 2004 22:17:59 -0000 1.488 @@ -12,6 +12,9 @@ =item 1.99_17-dev +MP_AP_BUILD configure option removed. Now implicit when MP_USE_STATIC +is specified [Gozer] + Apache::Module $mod->version() and $mod->minor_version() renamed to $mod->ap_api_major_version() and $mod->ap_api_minor_version for clarity [Gozer] 1.178 +3 -8 modperl-2.0/lib/Apache/Build.pm Index: Build.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- Build.pm 18 Sep 2004 15:38:25 -0000 1.177 +++ Build.pm 18 Sep 2004 22:18:00 -0000 1.178 @@ -247,26 +247,21 @@ sub should_build_apache { my ($self) = @_; - return $self->{MP_AP_BUILD} ? 1 : 0; + return $self->{MP_USE_STATIC} ? 1 : 0; } sub configure_apache { my ($self) = @_; unless ($self->{MP_AP_CONFIGURE}) { - error "You specified MP_AP_BUILD but did not specify the " . + error "You specified MP_USE_STATIC but did not specify the " . "arguments to httpd's ./configure with MP_AP_CONFIGURE"; exit 1; } unless ($self->{MP_AP_PREFIX}) { - error "You specified MP_AP_BUILD but did not speficy the " . + error "You specified MP_USE_STATIC but did not speficy the " . "location of httpd's source tree with MP_AP_PREFIX"; - exit 1; - } - - unless ($self->{MP_USE_STATIC}) { - error "When building httpd, you must set MP_USE_STATIC=1"; exit 1; } 1.30 +0 -1 modperl-2.0/lib/ModPerl/BuildOptions.pm Index: BuildOptions.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildOptions.pm,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- BuildOptions.pm 7 Sep 2004 13:19:12 -0000 1.29 +++ BuildOptions.pm 18 Sep 2004 22:18:00 -0000 1.30 @@ -222,7 +222,6 @@ APXS 0 Path to apxs AP_PREFIX 0 Apache installation or source tree prefix AP_CONFIGURE 0 Apache ./configure arguments -AP_BUILD 0 Whether to build httpd APR_CONFIG 0 Path to apr-config XS_GLUE_DIR 1 Directories containing extension glue INCLUDE_DIR 1 Add directories to search for header files