From owner-svn-src-all@freebsd.org Sun Aug 9 05:15:30 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0388799DFAF; Sun, 9 Aug 2015 05:15:30 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CF29EB63; Sun, 9 Aug 2015 05:15:29 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t795FTv5068570; Sun, 9 Aug 2015 05:15:29 GMT (envelope-from peter@FreeBSD.org) Received: (from peter@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t795FTqB068568; Sun, 9 Aug 2015 05:15:29 GMT (envelope-from peter@FreeBSD.org) Message-Id: <201508090515.t795FTqB068568@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: peter set sender to peter@FreeBSD.org using -f From: Peter Wemm Date: Sun, 9 Aug 2015 05:15:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286504 - head/usr.bin/svn/lib/libapr_util X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Aug 2015 05:15:30 -0000 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 header file. */ -/* #undef HAVE_ICONV_H */ +#define HAVE_ICONV_H 1 /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1