Re: Location of APR/APU docs changed
Bojan Smojver <[email protected]>
| Newsgroups | gmane.comp.apache.apreq |
|---|---|
| Message-ID | <[email protected]> |
On Thu, 2006-12-28 at 14:04 +1100, Bojan Smojver wrote: > Changing APREQ build system to link to APR/APU docs with a specific > version number would be the correct thing to do. Something like this, maybe. -- Bojan
libapreq2-doc-version.patch
(text/x-patch, 2.8 KB)
Index: build/doxygen.conf.in
===================================================================
--- build/doxygen.conf.in (revision 490861)
+++ build/doxygen.conf.in (working copy)
@@ -64,8 +64,8 @@
PREDEFINED = APREQ_DECLARE(x)=x \
APREQ_DECLARE_NONSTD(x)=x
-TAGFILES = docs/apr.tag=http://apr.apache.org/docs/apr \
- docs/apu.tag=http://apr.apache.org/docs/apr-util
+TAGFILES = docs/apr.tag=http://apr.apache.org/docs/apr/@APR_DOC_VERSION@ \
+ docs/apu.tag=http://apr.apache.org/docs/apr-util/@APU_DOC_VERSION@
GENERATE_TAGFILE = docs/apreq2.tag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = NO
Index: acinclude.m4
===================================================================
--- acinclude.m4 (revision 490861)
+++ acinclude.m4 (working copy)
@@ -92,8 +92,19 @@
if test -z "`$prereq_check apache2 $APACHE2_HTTPD`"; then
AC_MSG_ERROR([Bad apache2 binary ($APACHE2_HTTPD)])
fi
+
+ APR_DOC_VERSION=`$APACHE2_APXS -q APR_VERSION 2>/dev/null | cut -d. -f -2`
+ APU_DOC_VERSION=`$APACHE2_APXS -q APU_VERSION 2>/dev/null | cut -d. -f -2`
fi
+dnl Fallback to oldest version available
+ if test "x$APR_DOC_VERSION" = 'x'; then
+ APR_DOC_VERSION=0.9
+ fi
+ if test "x$APU_DOC_VERSION" = 'x'; then
+ APU_DOC_VERSION=0.9
+ fi
+
AC_CHECK_FILE([$APR_CONFIG],,
AC_MSG_ERROR([invalid apr-config location ($APR_CONFIG)- did you forget to configure apr?]))
@@ -266,6 +277,9 @@
AC_SUBST(MM_OPTS)
AC_SUBST(TAR)
+ AC_SUBST(APR_DOC_VERSION)
+ AC_SUBST(APU_DOC_VERSION)
+
if test "x$OS" = "xsolaris"; then
$PERL -pi -e 's,^shrext=,shrext_cmds=,' libtool
fi
Index: Makefile.am
===================================================================
--- Makefile.am (revision 490861)
+++ Makefile.am (working copy)
@@ -18,8 +18,8 @@
s(href="/APR/Request/Param/(?:Table|Cookie).html")(href="group__apreq__xs__apr__request.html")g, \
s(href="/APR/Request.html")(href="group__apreq__xs__apr__request.html")g, \
s(href="/APR/Request/([^/]+).html")(href="group__apreq__xs__apr__request__\L$$1.html")g, \
- s(href="/APR/Brigade.html")(href="http://apr.apache.org/docs/apr-util/apr__buckets_8h.html")g, \
- s(href="/APR/([^/]+).html")(href="http://apr.apache.org/docs/apr/apr__\L$$1s_8h.html")g
+ s(href="/APR/Brigade.html")(href="http://apr.apache.org/docs/apr-util/$(APU_DOC_VERSION)/apr__buckets_8h.html")g, \
+ s(href="/APR/([^/]+).html")(href="http://apr.apache.org/docs/apr/$(APR_DOC_VERSION)/apr__\L$$1s_8h.html")g
EUM=ExtUtils::Manifest
PM_DIR=glue/perl/lib/Apache2