summaryrefslogtreecommitdiffstats
path: root/usr.bin/svn
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2015-08-10 00:46:24 +0000
committerpeter <peter@FreeBSD.org>2015-08-10 00:46:24 +0000
commit720031fa1957132607bfa3c200095ff502fe1b13 (patch)
treeeede7d6954fafcbd5ac65ceb3be016b0de86db65 /usr.bin/svn
parent4ed05425934d2538f80221d725d0cd075f2fa1b5 (diff)
downloadFreeBSD-src-720031fa1957132607bfa3c200095ff502fe1b13.zip
FreeBSD-src-720031fa1957132607bfa3c200095ff502fe1b13.tar.gz
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
Diffstat (limited to 'usr.bin/svn')
-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 29a5dd1..4631ae7 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 5492454..ac247d0 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
OpenPOWER on IntegriCloud