Return-Path: Delivered-To: apmail-httpd-apreq-cvs-archive@www.apache.org Received: (qmail 11823 invoked from network); 30 Dec 2006 21:39:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Dec 2006 21:39:14 -0000 Received: (qmail 44984 invoked by uid 500); 30 Dec 2006 21:39:20 -0000 Delivered-To: apmail-httpd-apreq-cvs-archive@httpd.apache.org Received: (qmail 44963 invoked by uid 500); 30 Dec 2006 21:39:20 -0000 Mailing-List: contact apreq-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: apreq-dev@httpd.apache.org List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list apreq-cvs@httpd.apache.org Received: (qmail 44951 invoked by uid 99); 30 Dec 2006 21:39:20 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Dec 2006 13:39:20 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Dec 2006 13:39:12 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 37A021A981A; Sat, 30 Dec 2006 13:38:18 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r491323 - in /httpd/apreq/branches/v2_09: Makefile.am acinclude.m4 build/doxygen.conf.in Date: Sat, 30 Dec 2006 21:38:18 -0000 To: apreq-cvs@httpd.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061230213818.37A021A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bojan Date: Sat Dec 30 13:38:17 2006 New Revision: 491323 URL: http://svn.apache.org/viewvc?view=rev&rev=491323 Log: Backport r491122 from the trunk Modified: httpd/apreq/branches/v2_09/Makefile.am httpd/apreq/branches/v2_09/acinclude.m4 httpd/apreq/branches/v2_09/build/doxygen.conf.in Modified: httpd/apreq/branches/v2_09/Makefile.am URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_09/Makefile.am?view=diff&rev=491323&r1=491322&r2=491323 ============================================================================== --- httpd/apreq/branches/v2_09/Makefile.am (original) +++ httpd/apreq/branches/v2_09/Makefile.am Sat Dec 30 13:38:17 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/branches/v2_09/acinclude.m4 URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_09/acinclude.m4?view=diff&rev=491323&r1=491322&r2=491323 ============================================================================== --- httpd/apreq/branches/v2_09/acinclude.m4 (original) +++ httpd/apreq/branches/v2_09/acinclude.m4 Sat Dec 30 13:38:17 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/branches/v2_09/build/doxygen.conf.in URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_09/build/doxygen.conf.in?view=diff&rev=491323&r1=491322&r2=491323 ============================================================================== --- httpd/apreq/branches/v2_09/build/doxygen.conf.in (original) +++ httpd/apreq/branches/v2_09/build/doxygen.conf.in Sat Dec 30 13:38:17 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