From 92ec33c9784fd22512f420e7b418560e41e13c03 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 10 Aug 2015 00:46:24 +0000 Subject: [PATCH] Don't assume iconv is enabled. I didn't realize there was a configuration control to turn it off and it wasn't being respected. Pointed out by: gshapiro --- usr.bin/svn/lib/libapr_util/apu.h | 2 +- usr.bin/svn/lib/libapr_util/apu_config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h index 29a5dd19ada8..4631ae704a66 100644 --- a/usr.bin/svn/lib/libapr_util/apu.h +++ b/usr.bin/svn/lib/libapr_util/apu.h @@ -122,7 +122,7 @@ #define APU_HAVE_NSS 0 #define APU_HAVE_APR_ICONV 0 -#define APU_HAVE_ICONV 1 +#define APU_HAVE_ICONV 0 #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV) #endif /* APU_H */ diff --git a/usr.bin/svn/lib/libapr_util/apu_config.h b/usr.bin/svn/lib/libapr_util/apu_config.h index 5492454caaad..ac247d06b132 100644 --- a/usr.bin/svn/lib/libapr_util/apu_config.h +++ b/usr.bin/svn/lib/libapr_util/apu_config.h @@ -41,7 +41,7 @@ /* #undef HAVE_FREETDS_SYBDB_H */ /* Define to 1 if you have the header file. */ -#define HAVE_ICONV_H 1 +/* #undef HAVE_ICONV_H */ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1