diff options
| author | peter <peter@FreeBSD.org> | 2013-07-01 07:07:35 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-07-01 07:07:35 +0000 |
| commit | 75dee8bb5ae9162b5536e80ab4be44936ed4b65a (patch) | |
| tree | dffedd8cde3fbb8f33cd6e626f2a760cf10ccd7e /usr.bin/svn/lib | |
| parent | db19956e7fbaabc446e776ff0a82e10bd65e8c33 (diff) | |
| download | FreeBSD-src-75dee8bb5ae9162b5536e80ab4be44936ed4b65a.zip FreeBSD-src-75dee8bb5ae9162b5536e80ab4be44936ed4b65a.tar.gz | |
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.
Diffstat (limited to 'usr.bin/svn/lib')
| -rw-r--r-- | usr.bin/svn/lib/libapr_util/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/svn/lib/libapr_util/apu.h | 4 |
2 files changed, 10 insertions, 0 deletions
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 <bsd.own.mk> + +.if ${MK_ICONV} == "yes" +CFLAGS+= -DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1 +.endif + .include <bsd.lib.mk> 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 */ |
