summaryrefslogtreecommitdiffstats
path: root/usr.bin/svn/lib
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2015-08-09 05:15:28 +0000
committerpeter <peter@FreeBSD.org>2015-08-09 05:15:28 +0000
commita55265d19a911007ab0d8c1b2e261f52af585ac8 (patch)
tree0ea268737be6ac3e78b8945c1f53c2afe17463b4 /usr.bin/svn/lib
parenta9920216aaac71c26df6ad27f831f7d627470fff (diff)
downloadFreeBSD-src-a55265d19a911007ab0d8c1b2e261f52af585ac8.zip
FreeBSD-src-a55265d19a911007ab0d8c1b2e261f52af585ac8.tar.gz
Update apr-util config - I don't believe this part is used by svn, but
if it were, use shm_* instead of sysvshm.
Diffstat (limited to 'usr.bin/svn/lib')
-rw-r--r--usr.bin/svn/lib/libapr_util/apu.h10
-rw-r--r--usr.bin/svn/lib/libapr_util/apu_config.h4
2 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h
index 639cec4..29a5dd1 100644
--- a/usr.bin/svn/lib/libapr_util/apu.h
+++ b/usr.bin/svn/lib/libapr_util/apu.h
@@ -117,16 +117,12 @@
#define APU_HAVE_FREETDS 0
#define APU_HAVE_ODBC 0
-#define APU_HAVE_CRYPTO 0
-#define APU_HAVE_OPENSSL 0
+#define APU_HAVE_CRYPTO 1
+#define APU_HAVE_OPENSSL 1
#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 APU_HAVE_ICONV 1
#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 78a7065..5492454 100644
--- a/usr.bin/svn/lib/libapr_util/apu_config.h
+++ b/usr.bin/svn/lib/libapr_util/apu_config.h
@@ -13,7 +13,7 @@
/* #undef APU_DSO_LIBDIR */
/* Define if the inbuf parm to iconv() is const char ** */
-#define APU_ICONV_INBUF_CONST 1
+/* #undef APU_ICONV_INBUF_CONST */
/* Define that OpenSSL uses const buffers */
#define CRYPTO_OPENSSL_CONST_BUFFERS 1
@@ -41,7 +41,7 @@
/* #undef HAVE_FREETDS_SYBDB_H */
/* Define to 1 if you have the <iconv.h> header file. */
-/* #undef HAVE_ICONV_H */
+#define HAVE_ICONV_H 1
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
OpenPOWER on IntegriCloud