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/02 04:21:55 UTC
cvs commit: httpd-apreq-2/t Makefile.am
joes 2003/10/01 19:21:55
Modified: . acinclude.m4
env Makefile.am
src Makefile.am
t Makefile.am
Log:
Rework build system around ap[ru]-config to allow apr & apr-utils to have non-httpd install locations.
Revision Changes Path
1.8 +10 -2 httpd-apreq-2/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- acinclude.m4 28 Jun 2003 22:25:07 -0000 1.7
+++ acinclude.m4 2 Oct 2003 02:21:55 -0000 1.8
@@ -7,17 +7,25 @@
[ --with-perl path to perl executable],
[PERL=$withval],
[PERL="perl"])
- APU_CONFIG=`$APACHE2_APXS -q BINDIR`/apu-config
- APR_CONFIG=`$APACHE2_APXS -q BINDIR`/apr-config
+ APU_CONFIG=`$APACHE2_APXS -q APU_BINDIR`/apu-config
+ APR_CONFIG=`$APACHE2_APXS -q APR_BINDIR`/apr-config
APACHE2_INCLUDES=`$APACHE2_APXS -q INCLUDEDIR`
APACHE2_MODULES=`$APACHE2_APXS -q LIBEXECDIR`
APACHE2_LIBS=`$APACHE2_APXS -q LIBDIR`
+ APR_INCLUDES=`$APR_CONFIG --includedir`
+ APU_INCLUDES=`$APU_CONFIG --includedir`
+ APR_LIBS=`$APR_CONFIG --link-ld --link-libtool`
+ APU_LIBS=`$APU_CONFIG --link-ld --link-libtool`
AC_SUBST(APU_CONFIG)
AC_SUBST(APR_CONFIG)
AC_SUBST(APACHE2_APXS)
AC_SUBST(APACHE2_INCLUDES)
AC_SUBST(APACHE2_MODULES)
AC_SUBST(APACHE2_LIBS)
+ AC_SUBST(APR_INCLUDES)
+ AC_SUBST(APU_INCLUDES)
+ AC_SUBST(APR_LIBS)
+ AC_SUBST(APU_LIBS)
AC_SUBST(PERL)
])
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am 30 Jun 2003 20:42:14 -0000 1.10
+++ Makefile.am 2 Oct 2003 02:21:55 -0000 1.11
@@ -1,5 +1,5 @@
-INCLUDES = -I../src -I@APACHE2_INCLUDES@
-
+INCLUDES = -I../src -I@APACHE2_INCLUDES@ -I@APR_INCLUDES@ -I@APU_INCLUDES@
+LIBS = @APR_LIBS@ @APU_LIBS@
TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args(); generate_script("t/TEST")
lib_LIBRARIES = libapreq_cgi.a
1.10 +3 -3 httpd-apreq-2/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am 9 Jun 2003 04:00:46 -0000 1.9
+++ Makefile.am 2 Oct 2003 02:21:55 -0000 1.10
@@ -1,12 +1,12 @@
-INCLUDES = -I@APACHE2_INCLUDES@
-LIBS = -L@APACHE2_LIBS@
+INCLUDES = -I@APR_INCLUDES@ -I@APU_INCLUDES@
+LIBS = @APR_LIBS@ @APU_LIBS@
lib_LTLIBRARIES = libapreq.la
nobase_include_HEADERS = apreq.h apreq_cookie.h apreq_params.h \
apreq_env.h apreq_parsers.h
libapreq_la_SOURCES = apreq.c apreq_cookie.c \
apreq_params.c apreq_parsers.c
-libapreq_la_LDFLAGS = -lapr-0 -laprutil-0 -version-info 2:0
+libapreq_la_LDFLAGS = -version-info 2:0
libdir=@APACHE2_LIBS@
includedir=@APACHE2_INCLUDES@
1.11 +2 -2 httpd-apreq-2/t/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/t/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am 21 Jul 2003 04:18:16 -0000 1.10
+++ Makefile.am 2 Oct 2003 02:21:55 -0000 1.11
@@ -1,5 +1,5 @@
-INCLUDES = -I../src -I@APACHE2_INCLUDES@
-LIBS = -L../src
+INCLUDES = -I../src -I@APR_INCLUDES@ -I@APU_INCLUDES@
+LIBS = -L../src @APR_LIBS@ @APU_LIBS@
noinst_LIBRARIES = libapreq_tests.a
libapreq_tests_a_SOURCES = CuTest.c env.c cookie.c params.c parsers.c