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 bo...@apache.org on 2006/12/29 23:27:13 UTC
svn commit: r491122 - in /httpd/apreq/trunk: Makefile.am acinclude.m4
build/doxygen.conf.in
Author: bojan
Date: Fri Dec 29 14:27:12 2006
New Revision: 491122
URL: http://svn.apache.org/viewvc?view=rev&rev=491122
Log:
Link APREQ docs to version specific APR/APU docs.
Modified:
httpd/apreq/trunk/Makefile.am
httpd/apreq/trunk/acinclude.m4
httpd/apreq/trunk/build/doxygen.conf.in
Modified: httpd/apreq/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/Makefile.am?view=diff&rev=491122&r1=491121&r2=491122
==============================================================================
--- httpd/apreq/trunk/Makefile.am (original)
+++ httpd/apreq/trunk/Makefile.am Fri Dec 29 14:27:12 2006
@@ -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
Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/acinclude.m4?view=diff&rev=491122&r1=491121&r2=491122
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Fri Dec 29 14:27:12 2006
@@ -92,6 +92,17 @@
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],,
@@ -265,6 +276,9 @@
AC_SUBST(PERL_OPTS)
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
Modified: httpd/apreq/trunk/build/doxygen.conf.in
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/build/doxygen.conf.in?view=diff&rev=491122&r1=491121&r2=491122
==============================================================================
--- httpd/apreq/trunk/build/doxygen.conf.in (original)
+++ httpd/apreq/trunk/build/doxygen.conf.in Fri Dec 29 14:27:12 2006
@@ -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