From commits-return-7727-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Wed May 31 13:39:17 2006 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 26351 invoked from network); 31 May 2006 13:39:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 May 2006 13:39:17 -0000 Received: (qmail 17320 invoked by uid 500); 31 May 2006 13:39:16 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 17278 invoked by uid 500); 31 May 2006 13:39:16 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 17267 invoked by uid 99); 31 May 2006 13:39:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2006 06:39:16 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2006 06:39:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 93A701A983A; Wed, 31 May 2006 06:38:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410522 - /apr/apr-util/trunk/include/apu.hw Date: Wed, 31 May 2006 13:38:55 -0000 To: commits@apr.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060531133855.93A701A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Wed May 31 06:38:54 2006 New Revision: 410522 URL: http://svn.apache.org/viewvc?rev=410522&view=rev Log: Allow external override for XLATE support. The XLATE can be disabled by setting the APR_HAS_XLATE=0 on build time. Modified: apr/apr-util/trunk/include/apu.hw Modified: apr/apr-util/trunk/include/apu.hw URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apu.hw?rev=410522&r1=410521&r2=410522&view=diff ============================================================================== --- apr/apr-util/trunk/include/apu.hw (original) +++ apr/apr-util/trunk/include/apu.hw Wed May 31 06:38:54 2006 @@ -1,4 +1,4 @@ -/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as +/* Copyright 2000-2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -94,10 +94,12 @@ #define APU_HAVE_DB 0 #endif - +/* Allow external override */ +#if !defined(APU_HAS_XLATE) #define APU_HAVE_APR_ICONV 1 #define APU_HAVE_ICONV 0 #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV) +#endif #if !defined(APU_HAVE_PGSQL) #define APU_HAVE_PGSQL 0