Date: Mon, 1 Jul 2013 07:07:36 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> 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 Message-ID: <201307010707.r6177aZv010179@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307010707.r6177aZv010179>