From 75dee8bb5ae9162b5536e80ab4be44936ed4b65a Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 1 Jul 2013 07:07:35 +0000 Subject: 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. --- usr.bin/svn/lib/libapr_util/Makefile | 6 ++++++ usr.bin/svn/lib/libapr_util/apu.h | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'usr.bin/svn') diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile index 37b787b..4d82443 100644 --- a/usr.bin/svn/lib/libapr_util/Makefile +++ b/usr.bin/svn/lib/libapr_util/Makefile @@ -28,5 +28,11 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${APR}/include/arch/unix \ -I${APR}/include +.include + +.if ${MK_ICONV} == "yes" +CFLAGS+= -DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1 +.endif + .include diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h index 753d07e..ea090bf 100644 --- a/usr.bin/svn/lib/libapr_util/apu.h +++ b/usr.bin/svn/lib/libapr_util/apu.h @@ -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 */ -- cgit v1.1