joes 2004/06/10 13:51:33
Modified: . INSTALL STATUS acinclude.m4
env Makefile.am
env/t TEST.PL
env/t/conf extra.conf.in
Log:
FreeBSD builds now.
Revision Changes Path
1.12 +2 -0 httpd-apreq-2/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/INSTALL,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- INSTALL 1 Nov 2003 04:13:42 -0000 1.11
+++ INSTALL 10 Jun 2004 20:51:33 -0000 1.12
@@ -8,6 +8,8 @@
INSTRUCTIONS:
+FreeBSD users must substitute "gmake" for "make" below.
+
Unix build, where libtool/automake/autoconf works:
% ./configure --with-apache2-apxs=/path/to/apache2/bin/apxs
1.48 +2 -4 httpd-apreq-2/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-apreq-2/STATUS,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- STATUS 8 Jun 2004 04:13:36 -0000 1.47
+++ STATUS 10 Jun 2004 20:51:33 -0000 1.48
@@ -86,9 +86,7 @@
http://marc.theaimsgroup.com/?t=107766265600001&r=1&w=2
- Fix build automake/libtool/autoconf build system so it works
- properly on OSX & AIX. FreeBSD cannot build httpd-apreq2 either,
- but there are too many problems with the current (May 2004)
- ports of the auto* tools for us to accomodate FreeBSD (yet).
+ properly on OSX & AIX.
- The current API does not handle failed query_string parsing
adequately (apreq_request does log an error message, but
1.19 +4 -4 httpd-apreq-2/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- acinclude.m4 10 Jun 2004 03:17:43 -0000 1.18
+++ acinclude.m4 10 Jun 2004 20:51:33 -0000 1.19
@@ -88,11 +88,11 @@
APU_INCLUDES=`$APU_CONFIG --includes`
APR_LA=`$APR_CONFIG --link-libtool`
APU_LA=`$APU_CONFIG --link-libtool`
- APR_LTLIBS=`$APR_CONFIG --link-libtool --libs`
- APU_LTLIBS=`$APU_CONFIG --link-libtool --libs`
+ APR_LTLIBS=`$APR_CONFIG --link-libtool --ldflags --libs`
+ APU_LTLIBS=`$APU_CONFIG --link-libtool --ldflags --libs`
dnl perl glue/tests do not use libtool: need ld linker flags
- APR_LDLIBS=`$APR_CONFIG --link-ld --libs`
- APU_LDLIBS=`$APU_CONFIG --link-ld --libs`
+ APR_LDLIBS=`$APR_CONFIG --link-ld --ldflags --libs`
+ APU_LDLIBS=`$APU_CONFIG --link-ld --ldflags --libs`
dnl Absolute source/build directory
abs_srcdir=`(cd $srcdir && pwd)`
1.20 +2 -2 httpd-apreq-2/env/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.am 28 Feb 2004 05:19:38 -0000 1.19
+++ Makefile.am 10 Jun 2004 20:51:33 -0000 1.20
@@ -40,7 +40,7 @@
run_tests : t/TEST
-cp -f test_cgi t/cgi-bin
- @PERL@ t/TEST
+ MAKE=$(MAKE) @PERL@ t/TEST
else
run_tests:
@@ -51,7 +51,7 @@
test :: all check run_tests
test_clean : cmodules_clean
- [EMAIL PROTECTED]@ t/TEST -clean
+ -MAKE=$(MAKE) @PERL@ t/TEST -clean
-rm -rf t/htdocs t/logs t/modules t/TEST t/cgi-bin/test_cgi
t/cgi-bin/.libs t/conf/extra.conf
cmodules_clean:
1.8 +21 -0 httpd-apreq-2/env/t/TEST.PL
Index: TEST.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/t/TEST.PL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TEST.PL 27 Oct 2003 06:47:25 -0000 1.7
+++ TEST.PL 10 Jun 2004 20:51:33 -0000 1.8
@@ -39,6 +39,7 @@
package My::TestConfig;
use Apache::TestTrace;
use Apache::TestConfigC;
+use Config;
use Apache::Build;
use constant WIN32 => Apache::Build::WIN32;
@@ -87,4 +88,24 @@
EOF
}
close $fh or die "close $makefile: $!";
+}
+
+sub cmodules_makefile_vars {
+ my $make = $ENV{MAKE} || $Config{make};
+ return <<EOF; # XXX: do we need to propagate all the vars in config.nice?
+MAKE=$make
+EOF
+}
+
+sub cmodules_make {
+ my $self = shift;
+ my $targ = shift || 'all';
+ my $make = $ENV{MAKE} || $Config{make};
+
+ my $cmd = "cd $self->{cmodules_dir} && $make $targ";
+ debug $cmd;
+ system $cmd;
+ if ($?) {
+ die "Failed to build c-modules";
+ }
}
1.4 +1 -0 httpd-apreq-2/env/t/conf/extra.conf.in
Index: extra.conf.in
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/t/conf/extra.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- extra.conf.in 23 Oct 2003 23:58:15 -0000 1.3
+++ extra.conf.in 10 Jun 2004 20:51:33 -0000 1.4
@@ -1,4 +1,5 @@
ScriptAlias /cgi-bin/ "@ServerRoot@/cgi-bin/"
+LockFile @ServerRoot@/logs/accept.lock
<Directory "@ServerRoot@/cgi-bin">
AllowOverride None
