joes 2004/07/16 10:12:37
Modified: . STATUS acinclude.m4
build xsbuilder.pl
env Makefile.am
t Makefile.am
Log:
Introduce @AP[RU]_LDFLAGS@ so we don't mix these flags with @AP[RU]_LIBS@
until EU::MM forces us to (in build/xsbuilder.pl). Also list functions not
covered by our tests in STATUS.
Revision Changes Path
1.68 +14 -1 httpd-apreq-2/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-apreq-2/STATUS,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- STATUS 13 Jul 2004 21:09:18 -0000 1.67
+++ STATUS 16 Jul 2004 17:12:36 -0000 1.68
@@ -58,6 +58,19 @@
apr_file_printf(err, ...), be used on Win32 in
cgi_log() of src/apreq_env.c?
+ - The current tests don't cover these functions,
+ so add CuTest tests for them:
+ - apreq_make_value()
+ - apreq_copy_value()
+ - apreq_merge_values()
+ - apreq_enctype()
+ - apreq_memmem()
+ - apreq_quote()
+ - apreq_quote_once()
+ - apreq_escape()
+ - apreq_ua_cookie_version()
+ - apreq_encode_param()
+
- CuTest needs va_arg to print comments for a failed unit test.
- Get env/ (Apache::Test) tests to work for --with-apache2-src option.
1.27 +6 -2 httpd-apreq-2/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- acinclude.m4 16 Jul 2004 16:28:12 -0000 1.26
+++ acinclude.m4 16 Jul 2004 17:12:36 -0000 1.27
@@ -97,8 +97,10 @@
APR_LTLIBS=`$APR_CONFIG --link-libtool --libs`
APU_LTLIBS=`$APU_CONFIG --link-libtool --libs`
dnl perl glue/tests do not use libtool: need ld linker flags
- APR_LDLIBS=`$APR_CONFIG --link-ld --ldflags --libs`
- APU_LDLIBS=`$APU_CONFIG --link-ld --ldflags --libs`
+ APR_LDLIBS=`$APR_CONFIG --link-ld --libs`
+ APU_LDLIBS=`$APU_CONFIG --link-ld --libs`
+ APR_LDFLAGS=`$APR_CONFIG --ldflags`
+ APU_LDFLAGS=`$APU_CONFIG --ldflags`
dnl Absolute source/build directory
abs_srcdir=`(cd $srcdir && pwd)`
@@ -168,6 +170,8 @@
AC_SUBST(APU_LTLIBS)
AC_SUBST(APR_LDLIBS)
AC_SUBST(APU_LDLIBS)
+ AC_SUBST(APR_LDFLAGS)
+ AC_SUBST(APU_LDFLAGS)
AC_SUBST(APR_LA)
AC_SUBST(APU_LA)
AC_SUBST(PERL)
1.28 +8 -0 httpd-apreq-2/build/xsbuilder.pl
Index: xsbuilder.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/xsbuilder.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xsbuilder.pl 3 Jul 2004 15:45:53 -0000 1.27
+++ xsbuilder.pl 16 Jul 2004 17:12:36 -0000 1.28
@@ -58,6 +58,14 @@
die "Can't find apache include directory";
$apache_includes .= " $1";
+ $config =~ m/^s,[EMAIL PROTECTED]@,([^,]+)/m or
+ die "Can't find apr ldflags";
+ $apr_libs = $1;
+ $config =~ m/^s,[EMAIL PROTECTED]@,([^,]+)/m or
+ die "Can't find apu ldflags";
+ $apr_libs .= " $1";
+
+ # need -laprutil befpre -lapr
$config =~ m/^s,[EMAIL PROTECTED]@,([^,]+)/m or
die "Can't find apu libraries";
$apr_libs = $1;
1.23 +1 -0 httpd-apreq-2/env/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.am 15 Jun 2004 05:12:05 -0000 1.22
+++ Makefile.am 16 Jul 2004 17:12:37 -0000 1.23
@@ -1,5 +1,6 @@
INCLUDES = -I../src @APACHE2_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@
LIBS = ../src/[EMAIL PROTECTED]@.la @APR_LTLIBS@ @APU_LTLIBS@
+LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args();
generate_script("t/TEST")
EXTRA_DIST = t c-modules
mod_apreq_la_LDFLAGS = -export-dynamic -module -avoid-version -rpath [EMAIL
PROTECTED]@ -q LIBEXECDIR`
1.19 +1 -0 httpd-apreq-2/t/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/t/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.am 2 Jul 2004 02:52:45 -0000 1.18
+++ Makefile.am 16 Jul 2004 17:12:37 -0000 1.19
@@ -1,5 +1,6 @@
INCLUDES = -I../src @APR_INCLUDES@ @APU_INCLUDES@
LIBS = ../src/libapreq2.la @APR_LTLIBS@ @APU_LTLIBS@
+LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
noinst_LIBRARIES = libapreq2_tests.a
libapreq2_tests_a_SOURCES = CuTest.h test_apreq.h CuTest.c version.c
cookie.c params.c parsers.c
