svn commit: r286504 - head/usr.bin/svn/lib/libapr_util

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:15:28 2015
New Revision: 286504
URL: https://svnweb.freebsd.org/changeset/base/286504

Log:
  Update apr-util config - I don't believe this part is used by svn, but
  if it were, use shm_* instead of sysvshm.

Modified:
  head/usr.bin/svn/lib/libapr_util/apu.h
  head/usr.bin/svn/lib/libapr_util/apu_config.h

Modified: head/usr.bin/svn/lib/libapr_util/apu.h
==============================================================================
--- head/usr.bin/svn/lib/libapr_util/apu.h	Sun Aug  9 05:14:25 2015	(r286503)
+++ head/usr.bin/svn/lib/libapr_util/apu.h	Sun Aug  9 05:15:28 2015	(r286504)
@@ -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 */

Modified: head/usr.bin/svn/lib/libapr_util/apu_config.h
==============================================================================
--- head/usr.bin/svn/lib/libapr_util/apu_config.h	Sun Aug  9 05:14:25 2015	(r286503)
+++ head/usr.bin/svn/lib/libapr_util/apu_config.h	Sun Aug  9 05:15:28 2015	(r286504)
@@ -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