From owner-svn-src-head@FreeBSD.ORG  Mon Jul  1 07:07:36 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 65D0C8F8;
 Mon,  1 Jul 2013 07:07:36 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 58CD91208;
 Mon,  1 Jul 2013 07:07:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6177auI010181;
 Mon, 1 Jul 2013 07:07:36 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6177aZv010179;
 Mon, 1 Jul 2013 07:07:36 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201307010707.r6177aZv010179@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 1 Jul 2013 07:07:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252457 - head/usr.bin/svn/lib/libapr_util
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jul 2013 07:07:36 -0000

Author: peter
Date: Mon Jul  1 07:07:35 2013
New Revision: 252457
URL: http://svnweb.freebsd.org/changeset/base/252457

Log:
  If you've compiled your base system with WITH_ICONV, then use it for svn
  alongside the other consumers (bsdtar, csh etc).
  
  The svnlite build gets upset when it hits non-ascii characters in
  inconvenient places.

Modified:
  head/usr.bin/svn/lib/libapr_util/Makefile
  head/usr.bin/svn/lib/libapr_util/apu.h

Modified: head/usr.bin/svn/lib/libapr_util/Makefile
==============================================================================
--- head/usr.bin/svn/lib/libapr_util/Makefile	Mon Jul  1 07:03:38 2013	(r252456)
+++ head/usr.bin/svn/lib/libapr_util/Makefile	Mon Jul  1 07:07:35 2013	(r252457)
@@ -28,5 +28,11 @@ CFLAGS+= 	-DHAVE_CONFIG_H \
 		-I${APR}/include/arch/unix \
 		-I${APR}/include
 
+.include <bsd.own.mk>
+
+.if ${MK_ICONV} == "yes"
+CFLAGS+=	-DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1
+.endif
+
 .include <bsd.lib.mk>
 

Modified: head/usr.bin/svn/lib/libapr_util/apu.h
==============================================================================
--- head/usr.bin/svn/lib/libapr_util/apu.h	Mon Jul  1 07:03:38 2013	(r252456)
+++ head/usr.bin/svn/lib/libapr_util/apu.h	Mon Jul  1 07:07:35 2013	(r252457)
@@ -107,8 +107,12 @@
 #define APU_HAVE_OPENSSL       0
 #define APU_HAVE_NSS           0
 
+#ifndef APU_HAVE_APR_ICONV
 #define APU_HAVE_APR_ICONV     0
+#endif
+#ifndef APU_HAVE_ICONV
 #define APU_HAVE_ICONV         0
+#endif
 #define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
 #endif /* APU_H */