aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2015-08-10 00:46:24 +0000
committerPeter Wemm <peter@FreeBSD.org>2015-08-10 00:46:24 +0000
commit92ec33c9784fd22512f420e7b418560e41e13c03 (patch)
treeeede7d6954fafcbd5ac65ceb3be016b0de86db65 /usr.bin
parent1838fc920ff2daf0c793c073c2b4583b59f59268 (diff)
downloadsrc-92ec33c9784fd22512f420e7b418560e41e13c03.tar.gz
src-92ec33c9784fd22512f420e7b418560e41e13c03.zip
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
Notes
Notes: svn path=/head/; revision=286561
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/svn/lib/libapr_util/apu.h2
-rw-r--r--usr.bin/svn/lib/libapr_util/apu_config.h2
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 <iconv.h> header file. */
-#define HAVE_ICONV_H 1
+/* #undef HAVE_ICONV_H */
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1