Date: Wed, 19 Jun 2013 17:29:45 +0000 (UTC) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321298 - in head/devel: ruby-subversion subversion subversion/files Message-ID: <201306191729.r5JHTjZk004160@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Wed Jun 19 17:29:44 2013 New Revision: 321298 URL: http://svnweb.freebsd.org/changeset/ports/321298 Log: Upgrade subversion to 1.8.0. Re-enable ruby-subversion, as it supports ruby 1.9 Deleted: head/devel/subversion/files/extra-patch-enhanced-keyword Modified: head/devel/ruby-subversion/Makefile head/devel/subversion/Makefile head/devel/subversion/Makefile.common head/devel/subversion/distinfo head/devel/subversion/files/patch-configure head/devel/subversion/files/patch-configure.ac head/devel/subversion/pkg-plist Modified: head/devel/ruby-subversion/Makefile ============================================================================== --- head/devel/ruby-subversion/Makefile Wed Jun 19 17:17:11 2013 (r321297) +++ head/devel/ruby-subversion/Makefile Wed Jun 19 17:29:44 2013 (r321298) @@ -6,9 +6,6 @@ PKGNAMEPREFIX= ruby- MAINTAINER= lev@FreeBSD.org COMMENT= Ruby bindings for version control system -DEPRECATED= Does not work with Ruby 1.9 -EXPIRATION_DATE= 2013-05-02 - .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16 MASTERDIR= ${.CURDIR}/../../devel/subversion16 .else @@ -16,7 +13,7 @@ MASTERDIR= ${.CURDIR}/../../devel/subver .endif PKGDIR= ${.CURDIR} -USE_RUBY= yes +USE_RUBY= yes SVN_BUILD_BINDINGS=yes @@ -30,8 +27,4 @@ do-build: do-install: cd ${WRKSRC} ; ${MAKE} install-swig-rb -.if ${RUBY_VER} == 1.9 -BROKEN= does not work with ruby 1.9 -.endif - .include <bsd.port.post.mk> Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Wed Jun 19 17:17:11 2013 (r321297) +++ head/devel/subversion/Makefile Wed Jun 19 17:29:44 2013 (r321298) @@ -4,39 +4,36 @@ MAINTAINER= lev@FreeBSD.org COMMENT= Version control system -CONFLICTS_INSTALL= subversion-1.[6|8].[0-9]* +CONFLICTS_INSTALL= subversion-1.[6|7].[0-9]* USE_RC_SUBR= svnserve MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnrdump.1 \ - svnsync.1 svnversion.1 + svnsync.1 svnversion.1 svnmucc.1 MAN5= svnserve.conf.5 MAN8= svnserve.8 TXT_DOCS= BUGS CHANGES COMMITTERS INSTALL README -OPTIONS_DEFINE= P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE \ +OPTIONS_DEFINE= P4_STYLE_MARKERS FREEBSD_TEMPLATE \ MOD_DAV_SVN MOD_DONTDOTHAT SVNAUTHZ_VALIDATE \ - NEON SERF \ + SERF \ SASL BDB \ MAINTAINER_DEBUG \ - SVNSERVE_WRAPPER SVNMUCC \ + SVNSERVE_WRAPPER \ STATIC \ GNOME_KEYRING KDE_KWALLET \ BOOK TEST -OPTIONS_DEFAULT=P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON +OPTIONS_DEFAULT=P4_STYLE_MARKERS FREEBSD_TEMPLATE SERF P4_STYLE_MARKERS_DESC= Perforce-style conflict markers -ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support FREEBSD_TEMPLATE_DESC= FreeBSD Project log template MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X MOD_DONTDOTHAT_DESC= mod_dontdothat for Apache 2.X -NEON_DESC= WebDAV/Delta-V repo access module (neon) SERF_DESC= WebDAV/Delta-V repo access module (serf) MAINTAINER_DEBUG_DESC= Build debug version SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper -SVNMUCC_DESC= Install Multiple URL Command Client SVNAUTHZ_VALIDATE_DESC= install svnauthz-validate STATIC_DESC= Build static version (no shared libs) GNOME_KEYRING_DESC= Build with GNOME Keyring auth support @@ -54,7 +51,7 @@ SVNFSTYPE?= fsfs SUB_FILES= pkg-install \ pkg-deinstall -BOOK_VERSION= 4304 +BOOK_VERSION= 4515 .if make(repository) WITH_REPOSITORY_CREATION= yes @@ -68,9 +65,6 @@ MKREPOS_TARGET= _mkrepos .if ${PORT_OPTIONS:MP4_STYLE_MARKERS} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers .endif -.if ${PORT_OPTIONS:MENHANCED_KEYWORD} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword -.endif .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template .endif @@ -88,12 +82,6 @@ PLIST_SUB+= SVNSERVE_WRAPPER="@comment " SUB_LIST+= SVNSERVE_BIN_EXT="" .endif -.if ${PORT_OPTIONS:MSVNMUCC} -PLIST_SUB+= SVNMUCC="" -.else -PLIST_SUB+= SVNMUCC="@comment " -.endif - .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK} BOOK_HTML= svn-book-html-r${BOOK_VERSION}.tar.bz2 BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf @@ -133,12 +121,6 @@ LIB_DEPENDS= pre-everything:: @${ECHO_MSG} "" -.if ${PORT_OPTIONS:MNEON} - @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled." -.else - @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." -.endif - @${ECHO_MSG} "" .if ${PORT_OPTIONS:MBDB} @${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled." .else @@ -293,13 +275,6 @@ post-install: ${MKREPOS_TARGET} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve .endif -.if ${PORT_OPTIONS:MSVNMUCC} -. if ${PORT_OPTIONS:MSTATIC} - @${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/svnmucc ${PREFIX}/bin -. else - @${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/.libs/svnmucc ${PREFIX}/bin -. endif -.endif repository: _mkrepos Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Wed Jun 19 17:17:11 2013 (r321297) +++ head/devel/subversion/Makefile.common Wed Jun 19 17:29:44 2013 (r321298) @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.7.10 +PORTVERSION= 1.8.0 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \ ${MASTER_SITE_LOCAL:S/$/:book/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main -DIST_SUBDIR= subversion17 +DIST_SUBDIR= subversion18 MASTER_SITE_SUBDIR= subversion/:main \ lev/:book @@ -19,18 +19,17 @@ USE_KDE4= # Used below if KWallet suppor LICENSE= AL2 -CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|8].[0-9]* +CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|7].[0-9]* LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ expat:${PORTSDIR}/textproc/expat2 -CONFIGURE_ARGS+= --with-ssl \ - --without-swig \ +CONFIGURE_ARGS+= --without-swig \ --with-sqlite=${LOCALBASE} \ --with-expat=/usr/local/include:/usr/local/lib:expat .if defined(SVN_BUILD_BINDINGS) -CONFLICTS_BUILD+= ${PORTNAME}-1.[6|8].[0-9]* +CONFLICTS_BUILD+= ${PORTNAME}-1.[6|7].[0-9]* LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included @@ -38,15 +37,6 @@ OPTIONS= # Dirty hack: if OPTIONS is no .include <bsd.port.options.mk> -# Default is "on" -.if ${PORT_OPTIONS:MNEON} -LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29 -PLIST_SUB+= NEON="" -.else -CONFIGURE_ARGS+=--without-neon -PLIST_SUB+= NEON="@comment " -.endif - .if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+=--with-sasl=${LOCALBASE} Modified: head/devel/subversion/distinfo ============================================================================== --- head/devel/subversion/distinfo Wed Jun 19 17:17:11 2013 (r321297) +++ head/devel/subversion/distinfo Wed Jun 19 17:29:44 2013 (r321298) @@ -1,6 +1,6 @@ -SHA256 (subversion17/subversion-1.7.10.tar.bz2) = c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7 -SIZE (subversion17/subversion-1.7.10.tar.bz2) = 5952121 -SHA256 (subversion17/svn-book-html-r4304.tar.bz2) = a63d958b1ae70daf2ac93a53ece70a0ba0f8f7de7af3f74a665fe44b8f50ca14 -SIZE (subversion17/svn-book-html-r4304.tar.bz2) = 467806 -SHA256 (subversion17/svn-book-r4304.pdf) = 1b2cada79db8268fd6cd55fac4e5ee04c1e2977bbc587fa1098bd3613b9689b2 -SIZE (subversion17/svn-book-r4304.pdf) = 1921443 +SHA256 (subversion18/subversion-1.8.0.tar.bz2) = a470803293a8aced445cff0f7b24b95ad276600af55d4b24b1e196fd2de87f10 +SIZE (subversion18/subversion-1.8.0.tar.bz2) = 6711904 +SHA256 (subversion18/svn-book-html-r4515.tar.bz2) = 666cef147abc9b917a6bb6527da4f4869221d793126289c715f002bfb2baa508 +SIZE (subversion18/svn-book-html-r4515.tar.bz2) = 473182 +SHA256 (subversion18/svn-book-r4515.pdf) = 962d524ae2c861ec48a45723c484f4f5e1826ee2f9ccfe58b07b96af67b0bf5e +SIZE (subversion18/svn-book-r4515.pdf) = 1943481 Modified: head/devel/subversion/files/patch-configure ============================================================================== --- head/devel/subversion/files/patch-configure Wed Jun 19 17:17:11 2013 (r321297) +++ head/devel/subversion/files/patch-configure Wed Jun 19 17:29:44 2013 (r321298) @@ -1,6 +1,6 @@ ---- configure.orig 2011-11-29 20:16:31.000000000 +0400 -+++ configure 2011-12-05 23:43:08.000000000 +0400 -@@ -4326,7 +4326,7 @@ +--- configure.orig 2013-06-13 13:08:08.000000000 +0400 ++++ configure 2013-06-19 19:54:23.000000000 +0400 +@@ -4496,7 +4496,7 @@ # ==== Libraries, for which we may have source to build ====================== @@ -8,37 +8,27 @@ +APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\." - do_subdir_config="yes" -@@ -19106,11 +19106,11 @@ - SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include" - qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" - SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" -- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" -+ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS" - LIBS="$LIBS $SVN_KWALLET_LIBS" - qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" - kde_lib_suffix="`$KDE4_CONFIG --libsuffix`" -- LDFLAGS="$old_LDFLAGS ` -+ LDFLAGS="` + APR_WANTED_REGEXES="$APR_VER_REGEXES" +@@ -18971,11 +18971,11 @@ + SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include" + qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" + SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" +- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" ++ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS" + LIBS="$LIBS $SVN_KWALLET_LIBS" + qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" + kde_lib_suffix="`$KDE4_CONFIG --libsuffix`" +- LDFLAGS="$old_LDFLAGS ` ++ LDFLAGS="` input_flags="$qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix" output_flags="" filtered_dirs="/lib /lib64 /usr/lib /usr/lib64" -@@ -19129,7 +19129,7 @@ +@@ -18994,7 +18994,7 @@ if test -n "$output_flags"; then printf "%s" "${output_flags# }" fi -`" +` $old_LDFLAGS" - ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -20762,6 +20762,9 @@ - - fi - if test "$RUBY" != "none"; then -+ if [ -z "$PTHREAD_LIBS" ]; then -+ PTHREAD_LIBS=-pthread -+ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking rb_hash_foreach" >&5 - $as_echo_n "checking rb_hash_foreach... " >&6; } - if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)' >/dev/null; then Modified: head/devel/subversion/files/patch-configure.ac ============================================================================== --- head/devel/subversion/files/patch-configure.ac Wed Jun 19 17:17:11 2013 (r321297) +++ head/devel/subversion/files/patch-configure.ac Wed Jun 19 17:29:44 2013 (r321298) @@ -1,11 +1,1524 @@ ---- configure.ac.orig 2011-08-17 17:01:30.000000000 +0400 -+++ configure.ac 2011-12-05 23:43:19.000000000 +0400 -@@ -92,7 +92,7 @@ - dnl them. Only .7 and later can guarantee repository - dnl integrity with FSFS. - --APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."] +--- configure.orig.ac 1970-01-01 03:00:00.000000000 +0300 ++++ configure.ac 2013-06-19 19:55:21.000000000 +0400 +@@ -0,0 +1,1521 @@ ++dnl Licensed to the Apache Software Foundation (ASF) under one ++dnl or more contributor license agreements. See the NOTICE file ++dnl distributed with this work for additional information ++dnl regarding copyright ownership. The ASF licenses this file ++dnl to you under the Apache License, Version 2.0 (the ++dnl "License"); you may not use this file except in compliance ++dnl with the License. You may obtain a copy of the License at ++dnl ++dnl http://www.apache.org/licenses/LICENSE-2.0 ++dnl ++dnl Unless required by applicable law or agreed to in writing, ++dnl software distributed under the License is distributed on an ++dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++dnl KIND, either express or implied. See the License for the ++dnl specific language governing permissions and limitations ++dnl under the License. ++ ++dnl configure.ac: Autoconfiscation for Subversion ++dnl Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ(2.59) ++ ++dnl Get the version of Subversion, using m4's esyscmd() command to do this ++dnl at m4-time, since AC_INIT() requires it then. ++AC_INIT([subversion], ++ [esyscmd(python build/getversion.py SVN subversion/include/svn_version.h)], ++ [http://subversion.apache.org/]) ++ ++AC_CONFIG_SRCDIR(subversion/include/svn_types.h) ++AC_CONFIG_AUX_DIR([build]) ++ ++AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION) ++ ++AC_SUBST([abs_srcdir], ["`cd $srcdir && pwd`"]) ++AC_SUBST([abs_builddir], ["`pwd`"]) ++if test "$abs_srcdir" = "$abs_builddir"; then ++ canonicalized_srcdir="" ++else ++ canonicalized_srcdir="$srcdir/" ++fi ++AC_SUBST([canonicalized_srcdir]) ++ ++SWIG_LDFLAGS="$LDFLAGS" ++AC_SUBST([SWIG_LDFLAGS]) ++ ++# Generate config.nice early (before the arguments are munged) ++SVN_CONFIG_NICE(config.nice) ++ ++# ==== Check for programs ==================================================== ++ ++# Look for a C compiler (before anything can set CFLAGS) ++CMAINTAINERFLAGS="$CUSERFLAGS" ++CUSERFLAGS="$CFLAGS" ++AC_PROG_CC ++SVN_CC_MODE_SETUP ++ ++# Look for a C++ compiler (before anything can set CXXFLAGS) ++CXXMAINTAINERFLAGS="$CXXUSERFLAGS" ++CXXUSERFLAGS="$CXXFLAGS" ++AC_PROG_CXX ++SVN_CXX_MODE_SETUP ++ ++# Look for a C pre-processor ++AC_PROG_CPP ++ ++# Look for a good sed ++# AC_PROG_SED was introduced in Autoconf 2.59b ++m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [SED="${SED:-sed}"]) ++ ++# Grab target_cpu, so we can use it in the Solaris pkginfo file ++AC_CANONICAL_TARGET ++ ++# Look for an extended grep ++AC_PROG_EGREP ++ ++AC_PROG_LN_S ++ ++AC_PROG_INSTALL ++# If $INSTALL is relative path to our fallback install-sh, then convert ++# to an absolute path, as in some cases (e.g. Solaris VPATH build), libtool ++# may try to use it from a changed working directory. ++if test "$INSTALL" = "build/install-sh -c"; then ++ INSTALL="$abs_srcdir/$INSTALL" ++fi ++ ++if test -z "$MKDIR"; then ++ MKDIR="$INSTALL -d" ++fi ++AC_SUBST([MKDIR]) ++ ++# ==== Libraries, for which we may have source to build ====================== ++ ++dnl verify apr version and set apr flags ++dnl These regular expressions should not contain "\(" and "\)". ++dnl The specific reason we require APR 0.9.7 is: ++dnl It contains fixes to its file writing routines ++dnl now generating errors instead of silently ignoring ++dnl them. Only .7 and later can guarantee repository ++dnl integrity with FSFS. ++ +APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."] - - SVN_LIB_APR($APR_VER_REGEXES) - ++ ++SVN_LIB_APR($APR_VER_REGEXES) ++ ++if test `expr $apr_version : 2` -ne 0; then ++ dnl Bump the library so-version to 2 if using APR-2 ++ dnl (Debian uses so-version 1 for APR-1-with-largefile) ++ svn_lib_ver=2 ++ dnl APR-2 provides APRUTIL ++ apu_config=$apr_config ++ AC_SUBST(SVN_APRUTIL_INCLUDES) ++ AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"]) ++ AC_SUBST(SVN_APRUTIL_LIBS) ++else ++ svn_lib_ver=0 ++ APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."] ++ SVN_LIB_APRUTIL($APU_VER_REGEXES) ++fi ++SVN_LT_SOVERSION="-version-info $svn_lib_ver" ++AC_SUBST(SVN_LT_SOVERSION) ++AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver, ++ [Subversion library major verson]) ++ ++dnl Search for pkg-config ++AC_PATH_PROG(PKG_CONFIG, pkg-config) ++ ++dnl Search for serf ++SVN_LIB_SERF(1,2,1) ++ ++if test "$svn_lib_serf" = "yes"; then ++ AC_DEFINE([SVN_HAVE_SERF], 1, ++ [Defined if support for Serf is enabled]) ++fi ++ ++dnl Search for apr_memcache (only affects fs_fs) ++SVN_LIB_APR_MEMCACHE ++ ++if test "$svn_lib_apr_memcache" = "yes"; then ++ AC_DEFINE(SVN_HAVE_MEMCACHE, 1, ++ [Defined if apr_memcache (standalone or in apr-util) is present]) ++fi ++ ++ ++dnl Find Apache with a recent-enough magic module number ++SVN_FIND_APACHE(20020903) ++ ++dnl Search for SQLite. If you change SQLITE_URL from a .zip to ++dnl something else also update build/ac-macros/sqlite.m4 to reflect ++dnl the correct command to unpack the downloaded file. ++SQLITE_MINIMUM_VER="3.7.12" ++SQLITE_RECOMMENDED_VER="3.7.15.1" ++SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo ${SQLITE_RECOMMENDED_VER} | sed -e 's/\./ /g')).zip" ++ ++SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER}, ++ ${SQLITE_URL}) ++ ++AC_ARG_ENABLE(sqlite-compatibility-version, ++ AS_HELP_STRING([--enable-sqlite-compatibility-version=X.Y.Z], ++ [Allow binary to run against SQLite as old as ARG]), ++ [sqlite_compat_ver=$enableval],[sqlite_compat_ver=no]) ++ ++if test -n "$sqlite_compat_ver" && test "$sqlite_compat_ver" != no; then ++ SVN_SQLITE_VERNUM_PARSE([$sqlite_compat_ver], ++ [sqlite_compat_ver_num]) ++ CFLAGS="-DSVN_SQLITE_MIN_VERSION='\"$sqlite_compat_ver\"' $CFLAGS" ++ CFLAGS="-DSVN_SQLITE_MIN_VERSION_NUMBER=$sqlite_compat_ver_num $CFLAGS" ++fi ++ ++SVN_CHECK_FOR_ATOMIC_BUILTINS ++ ++if test "$svn_cv_atomic_builtins" = "yes"; then ++ AC_DEFINE(SVN_HAS_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins]) ++fi ++ ++dnl Set up a number of directories --------------------- ++ ++dnl Create SVN_BINDIR for proper substitution ++if test "${bindir}" = '${exec_prefix}/bin'; then ++ if test "${exec_prefix}" = "NONE"; then ++ if test "${prefix}" = "NONE"; then ++ SVN_BINDIR="${ac_default_prefix}/bin" ++ else ++ SVN_BINDIR="${prefix}/bin" ++ fi ++ else ++ SVN_BINDIR="${exec_prefix}/bin" ++ fi ++else ++ SVN_BINDIR="${bindir}" ++fi ++ ++dnl fully evaluate this value. when we substitute it into our tool scripts, ++dnl they will not have things such as ${bindir} available ++SVN_BINDIR="`eval echo ${SVN_BINDIR}`" ++AC_SUBST(SVN_BINDIR) ++ ++dnl provide ${bindir} in svn_private_config.h for use in compiled code ++AC_DEFINE_UNQUOTED(SVN_BINDIR, "${SVN_BINDIR}", ++ [Defined to be the path to the installed binaries]) ++ ++dnl This purposely does *not* allow for multiple parallel installs. ++dnl However, it is compatible with most gettext usages. ++localedir='${datadir}/locale' ++AC_SUBST(localedir) ++ ++dnl For SVN_LOCALE_DIR, we have to expand it to something. See SVN_BINDIR. ++if test "${datadir}" = '${prefix}/share' && test "${prefix}" = "NONE"; then ++ exp_localedir='${ac_default_prefix}/share/locale' ++else ++ exp_localedir=$localedir ++fi ++SVN_EXPAND_VAR(svn_localedir, "${exp_localedir}") ++AC_DEFINE_UNQUOTED(SVN_LOCALE_DIR, "${svn_localedir}", ++ [Defined to be the path to the installed locale dirs]) ++ ++dnl Check for libtool -- we'll definitely need it for all our shared libs! ++AC_MSG_NOTICE([configuring libtool now]) ++ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL]) ++AC_ARG_ENABLE(experimental-libtool, ++ AS_HELP_STRING([--enable-experimental-libtool],[Use APR's libtool]), ++ [experimental_libtool=$enableval],[experimental_libtool=no]) ++ ++if test "$experimental_libtool" = "yes"; then ++ echo "using APR's libtool" ++ sh_libtool="`$apr_config --apr-libtool`" ++ LIBTOOL="$sh_libtool" ++ SVN_LIBTOOL="$sh_libtool" ++else ++ sh_libtool="$abs_builddir/libtool" ++ SVN_LIBTOOL="\$(SHELL) $sh_libtool" ++fi ++AC_SUBST(SVN_LIBTOOL) ++ ++dnl Determine the libtool version ++changequote(, )dnl ++lt_pversion=`$LIBTOOL --version 2>/dev/null|$SED -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` ++lt_version=`echo $lt_pversion|$SED -e 's/\([a-z]*\)$/.\1/'` ++lt_major_version=`echo $lt_version | cut -d'.' -f 1` ++changequote([, ])dnl ++ ++dnl set the default parameters ++svn_enable_static=yes ++svn_enable_shared=yes ++ ++dnl check for --enable-static option ++AC_ARG_ENABLE(static, ++ AS_HELP_STRING([--enable-static], ++ [Build static libraries]), ++ [svn_enable_static="$enableval"], [svn_enable_static="yes"]) ++ ++dnl check for --enable-shared option ++AC_ARG_ENABLE(shared, ++ AS_HELP_STRING([--enable-shared], ++ [Build shared libraries]), ++ [svn_enable_shared="$enableval"], [svn_enable_shared="yes"]) ++ ++if test "$svn_enable_static" = "yes" && test "$svn_enable_shared" = "yes" ; then ++ AC_MSG_NOTICE([building both shared and static libraries]) ++elif test "$svn_enable_static" = "yes" ; then ++ AC_MSG_NOTICE([building static libraries only]) ++ LT_CFLAGS="-static $LT_CFLAGS" ++ LT_LDFLAGS="-static $LT_LDFLAGS" ++elif test "$svn_enable_shared" = "yes" ; then ++ AC_MSG_NOTICE([building shared libraries only]) ++ if test "$lt_major_version" = "1" ; then ++ LT_CFLAGS="-prefer-pic $LT_CFLAGS" ++ elif test "$lt_major_version" = "2" ; then ++ LT_CFLAGS="-shared $LT_CFLAGS" ++ fi ++ LT_LDFLAGS="-shared $LT_LDFLAGS" ++else ++ AC_MSG_ERROR([cannot disable both shared and static libraries]) ++fi ++ ++dnl Check for --enable-all-static option ++AC_ARG_ENABLE(all-static, ++ AS_HELP_STRING([--enable-all-static], ++ [Build completely static (standalone) binaries.]), ++ [ ++ if test "$enableval" = "yes" ; then ++ LT_LDFLAGS="-all-static $LT_LDFLAGS" ++ elif test "$enableval" != "no" ; then ++ AC_MSG_ERROR([--enable-all-static doesn't accept argument]) ++ fi ++]) ++ ++AC_SUBST(LT_CFLAGS) ++AC_SUBST(LT_LDFLAGS) ++ ++AC_ARG_ENABLE(local-library-preloading, ++ AS_HELP_STRING([--enable-local-library-preloading], ++ [Enable preloading of locally built libraries in locally ++ built executables. This may be necessary for testing ++ prior to installation on some platforms. It does not ++ work on some platforms (Darwin, OpenBSD, ...).]), ++ [ ++ if test "$enableval" != "no"; then ++ if test "$svn_enable_shared" = "yes"; then ++ TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts" ++ else ++ AC_MSG_ERROR([--enable-local-library-preloading conflicts with --disable-shared]) ++ fi ++ else ++ TRANSFORM_LIBTOOL_SCRIPTS="" ++ fi ++ ], [ ++ TRANSFORM_LIBTOOL_SCRIPTS="" ++]) ++AC_SUBST(TRANSFORM_LIBTOOL_SCRIPTS) ++ ++dnl Check if -no-undefined is needed for the platform. ++dnl It should always work but with libtool 1.4.3 on OS X it breaks the build. ++dnl So we only turn it on for platforms where we know we really need it. ++AC_MSG_CHECKING([whether libtool needs -no-undefined]) ++case $host in ++ *-*-cygwin*) ++ AC_MSG_RESULT([yes]) ++ LT_NO_UNDEFINED="-no-undefined" ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ LT_NO_UNDEFINED="" ++ ;; ++esac ++AC_SUBST(LT_NO_UNDEFINED) ++ ++AC_MSG_CHECKING([whether to avoid circular linkage at all costs]) ++case $host in ++ *-*-cygwin*) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE([SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK], 1, ++ [Define if circular linkage is not possible on this platform.]) ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++esac ++ ++dnl Check for trang. ++trang=yes ++AC_ARG_WITH(trang, ++AS_HELP_STRING([--with-trang=PATH], ++ [Specify the command to run the trang schema converter]), ++[ ++ trang="$withval" ++]) ++if test "$trang" = "yes"; then ++ AC_PATH_PROG(TRANG, trang, none) ++else ++ TRANG="$trang" ++ AC_SUBST(TRANG) ++fi ++ ++dnl Check for doxygen ++doxygen=yes ++AC_ARG_WITH(doxygen, ++AC_HELP_STRING([--with-doxygen=PATH], ++ [Specify the command to run doxygen]), ++[ ++ doxygen="$withval" ++]) ++if test "$doxygen" = "yes"; then ++ AC_PATH_PROG(DOXYGEN, doxygen, none) ++else ++ DOXYGEN="$doxygen" ++ AC_SUBST(DOXYGEN) ++fi ++ ++ ++dnl Check for libraries -------------------- ++ ++dnl Expat ------------------- ++ ++AC_ARG_WITH(expat, ++ AS_HELP_STRING([--with-expat=INCLUDES:LIB_SEARCH_DIRS:LIBS], ++ [Specify location of Expat]), ++ [svn_lib_expat="$withval"], ++ [svn_lib_expat="::expat"]) ++ ++# APR-util accepts "builtin" as an argument to this option so if the user ++# passed "builtin" pretend the user didn't specify the --with-expat option ++# at all. Expat will (hopefully) be found in apr-util. ++test "_$svn_lib_expat" = "_builtin" && svn_lib_expat="::expat" ++ ++AC_MSG_CHECKING([for Expat]) ++if test -n "`echo "$svn_lib_expat" | $EGREP ":.*:"`"; then ++ SVN_XML_INCLUDES="" ++ for i in [`echo "$svn_lib_expat" | $SED -e "s/\([^:]*\):.*/\1/"`]; do ++ SVN_XML_INCLUDES="$SVN_XML_INCLUDES -I$i" ++ done ++ SVN_XML_INCLUDES="${SVN_XML_INCLUDES## }" ++ for l in [`echo "$svn_lib_expat" | $SED -e "s/.*:\([^:]*\):.*/\1/"`]; do ++ LDFLAGS="$LDFLAGS -L$l" ++ done ++ for l in [`echo "$svn_lib_expat" | $SED -e "s/.*:\([^:]*\)/\1/"`]; do ++ SVN_XML_LIBS="$SVN_XML_LIBS -l$l" ++ done ++ SVN_XML_LIBS="${SVN_XML_LIBS## }" ++ old_CPPFLAGS="$CPPFLAGS" ++ old_LIBS="$LIBS" ++ CPPFLAGS="$CPPFLAGS $SVN_XML_INCLUDES" ++ LIBS="$LIBS $SVN_XML_LIBS" ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[ ++#include <expat.h> ++int main() ++{XML_ParserCreate(NULL);}]])], svn_lib_expat="yes", svn_lib_expat="no") ++ LIBS="$old_LIBS" ++ if test "$svn_lib_expat" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ else ++ SVN_XML_INCLUDES="" ++ SVN_XML_LIBS="" ++ CPPFLAGS="$CPPFLAGS $SVN_APRUTIL_INCLUDES" ++ if test "$enable_all_static" != "yes"; then ++ SVN_APRUTIL_LIBS="$SVN_APRUTIL_LIBS `$apu_config --libs`" ++ fi ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++#include <expat.h> ++int main() ++{XML_ParserCreate(NULL);}]])], svn_lib_expat="yes", svn_lib_expat="no") ++ if test "$svn_lib_expat" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ AC_MSG_WARN([Expat found amongst libraries used by APR-Util, but Subversion libraries might be needlessly linked against additional unused libraries. It can be avoided by specifying exact location of Expat in argument of --with-expat option.]) ++ else ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([Expat not found]) ++ fi ++ fi ++ CPPFLAGS="$old_CPPFLAGS" ++else ++ AC_MSG_RESULT([no]) ++ if test "$svn_lib_expat" = "yes"; then ++ AC_MSG_ERROR([--with-expat option requires argument]) ++ elif test "$svn_lib_expat" = "no"; then ++ AC_MSG_ERROR([Expat is required]) ++ else ++ AC_MSG_ERROR([Invalid syntax of argument of --with-expat option]) ++ fi ++fi ++AC_SUBST(SVN_XML_INCLUDES) ++AC_SUBST(SVN_XML_LIBS) ++ ++dnl Berkeley DB ------------------- ++ ++# Berkeley DB on SCO OpenServer needs -lsocket ++AC_CHECK_LIB(socket, socket) ++ ++# Build the BDB filesystem library only if we have an appropriate ++# version of Berkeley DB. ++case "$host" in ++powerpc-apple-darwin*) ++ # Berkeley DB 4.0 does not work on OS X. ++ SVN_FS_WANT_DB_MAJOR=4 ++ SVN_FS_WANT_DB_MINOR=1 ++ SVN_FS_WANT_DB_PATCH=25 ++ ;; ++*) ++ SVN_FS_WANT_DB_MAJOR=4 ++ SVN_FS_WANT_DB_MINOR=0 ++ SVN_FS_WANT_DB_PATCH=14 ++ ;; ++esac ++# Look for libdb4.so first: ++SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR, ++ $SVN_FS_WANT_DB_PATCH, [db4 db]) ++ ++AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR, ++ [The desired major version for the Berkeley DB]) ++AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MINOR, $SVN_FS_WANT_DB_MINOR, ++ [The desired minor version for the Berkeley DB]) ++AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH, ++ [The desired patch version for the Berkeley DB]) ++ ++AC_SUBST(SVN_DB_INCLUDES) ++AC_SUBST(SVN_DB_LIBS) ++ ++SVN_LIB_SASL ++ ++if test "$svn_lib_sasl" = "yes"; then ++ AC_DEFINE(SVN_HAVE_SASL, 1, ++ [Defined if Cyrus SASL v2 is present on the system]) ++fi ++ ++dnl Mac OS specific features ------------------- ++ ++SVN_LIB_MACHO_ITERATE ++SVN_LIB_MACOS_PLIST ++SVN_LIB_MACOS_KEYCHAIN ++ ++dnl APR_HAS_DSO ------------------- ++ ++AC_MSG_CHECKING([whether APR has support for DSOs]) ++old_CPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" ++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ ++#include <apr.h> ++#if !APR_HAS_DSO ++#error ++#endif]])], ++ APR_HAS_DSO="yes" ++ AC_MSG_RESULT([yes]), ++ APR_HAS_DSO="no" ++ AC_MSG_RESULT([no])) ++CPPFLAGS="$old_CPPFLAGS" ++ ++ ++dnl D-Bus (required for support for KWallet) ------------------- ++ ++if test -n "$PKG_CONFIG"; then ++ AC_MSG_CHECKING([for D-Bus .pc file]) ++ if $PKG_CONFIG --exists dbus-1; then ++ AC_MSG_RESULT([yes]) ++ old_CPPFLAGS="$CPPFLAGS" ++ old_LIBS="$LIBS" ++ DBUS_CPPFLAGS="`$PKG_CONFIG --cflags dbus-1`" ++ AC_MSG_CHECKING([D-Bus version]) ++ DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1`" ++ AC_MSG_RESULT([$DBUS_VERSION]) ++ # D-Bus 0.* requires DBUS_API_SUBJECT_TO_CHANGE ++ if test -n ["`echo "$DBUS_VERSION" | $EGREP '^0\.[[:digit:]]+'`"]; then ++ DBUS_CPPFLAGS="$DBUS_CPPFLAGS -DDBUS_API_SUBJECT_TO_CHANGE" ++ fi ++ DBUS_LIBS="`$PKG_CONFIG --libs dbus-1`" ++ CPPFLAGS="$CPPFLAGS $DBUS_CPPFLAGS" ++ LIBS="$LIBS $DBUS_LIBS" ++ AC_MSG_CHECKING([for D-Bus]) ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[ ++#include <dbus/dbus.h> ++int main() ++{dbus_bus_get(DBUS_BUS_SESSION, NULL);}]])], HAVE_DBUS="yes", HAVE_DBUS="no") ++ if test "$HAVE_DBUS" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ CPPFLAGS="$old_CPPFLAGS" ++ LIBS="$old_LIBS" ++ else ++ AC_MSG_RESULT([no]) ++ fi ++fi ++ ++dnl GPG Agent ------------------- ++ ++AC_ARG_WITH(gpg_agent, ++AS_HELP_STRING([--without-gpg-agent], ++ [Disable support for GPG-Agent]), ++ [], [with_gpg_agent=yes]) ++AC_MSG_CHECKING([whether to support GPG-Agent]) ++if test "$with_gpg_agent" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE([SVN_HAVE_GPG_AGENT], [1], ++ [Is GPG Agent support enabled?]) ++else ++ AC_MSG_RESULT([no]) ++fi ++ ++AC_SUBST(SVN_HAVE_GPG_AGENT) ++ ++dnl GNOME Keyring ------------------- ++ ++AC_ARG_WITH(gnome_keyring, ++ AS_HELP_STRING([--with-gnome-keyring], ++ [Enable use of GNOME Keyring for auth credentials (enabled by default if found)]), ++ [with_gnome_keyring="$withval"], ++ [with_gnome_keyring=auto]) ++ ++found_gnome_keyring=no ++AC_MSG_CHECKING([whether to look for GNOME Keyring]) ++if test "$with_gnome_keyring" != "no"; then ++ AC_MSG_RESULT([yes]) ++ if test "$svn_enable_shared" = "yes"; then ++ if test "$APR_HAS_DSO" = "yes"; then ++ if test -n "$PKG_CONFIG"; then ++ AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files]) ++ if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then ++ AC_MSG_RESULT([yes]) ++ old_CPPFLAGS="$CPPFLAGS" ++ SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags glib-2.0 gnome-keyring-1`" ++ CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES" ++ AC_CHECK_HEADER(gnome-keyring.h, found_gnome_keyring=yes, found_gnome_keyring=no) ++ AC_MSG_CHECKING([for GNOME Keyring]) ++ if test "$found_gnome_keyring" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], ++ [Is GNOME Keyring support enabled?]) ++ CPPFLAGS="$old_CPPFLAGS" ++ SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`" ++ else ++ AC_MSG_RESULT([no]) ++ if test "$with_gnome_keyring" = "yes"; then ++ AC_MSG_ERROR([cannot find GNOME Keyring]) ++ fi ++ fi ++ else ++ AC_MSG_RESULT([no]) ++ if test "$with_gnome_keyring" = "yes"; then ++ AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files.]) ++ else ++ with_gnome_keyring=no ++ fi ++ fi ++ else ++ if test "$with_gnome_keyring" = "yes"; then ++ AC_MSG_ERROR([cannot find pkg-config. GNOME Keyring requires this.]) ++ else ++ with_gnome_keyring=no ++ fi ++ fi ++ else ++ if test "$with_gnome_keyring" = "yes"; then ++ AC_MSG_ERROR([APR does not have support for DSOs. GNOME Keyring requires this.]) ++ else ++ with_gnome_keyring=no ++ fi ++ fi ++ else ++ if test "$with_gnome_keyring" = "yes"; then ++ AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared]) ++ else ++ with_gnome_keyring=no ++ fi ++ fi ++else ++ AC_MSG_RESULT([no]) ++fi ++AC_SUBST(SVN_GNOME_KEYRING_INCLUDES) ++AC_SUBST(SVN_GNOME_KEYRING_LIBS) ++ ++ ++dnl Ev2 experimental features ---------------------- ++dnl Note: The Ev2 implementations will be built unconditionally, but by ++dnl providing this flag, users can choose to use the currently-shimmed Ev2 ++dnl editor implementations for various operations. This will probably ++dnl negatively impact performance, but is useful for testing. ++AC_ARG_ENABLE(ev2-impl, ++ AS_HELP_STRING([--enable-ev2-impl], ++ [Use Ev2 implementations, where available [EXPERIMENTAL]]), ++ [enable_ev2_impl=$enableval],[enable_ev2_impl=no]) ++if test "$enable_ev2_impl" = "yes"; then ++ AC_DEFINE(ENABLE_EV2_IMPL, 1, ++ [Define to 1 if Ev2 implementations should be used.]) ++fi ++ ++ ++dnl I18n ------------------- ++ ++AC_ARG_ENABLE(nls, ++ AS_HELP_STRING([--disable-nls],[Disable gettext functionality]), ++ [enable_nls=$enableval],[enable_nls=yes]) ++ ++USE_NLS="no" ++if test "$enable_nls" = "yes"; then ++ dnl First, check to see if there is a working msgfmt. ++ AC_PATH_PROG(MSGFMT, msgfmt, none) ++ AC_PATH_PROG(MSGMERGE, msgmerge, none) ++ AC_PATH_PROG(XGETTEXT, xgettext, none) ++ if test "$MSGFMT" != "none"; then ++ AC_SEARCH_LIBS(bindtextdomain, [intl], [], ++ [ ++ enable_nls="no" ++ ]) ++ if test "$enable_nls" = "no"; then ++ # Destroy the cached result so we can test again ++ unset ac_cv_search_bindtextdomain ++ # On some systems, libintl needs libiconv to link properly, ++ # so try again with -liconv. ++ AC_SEARCH_LIBS(bindtextdomain, [intl], ++ [ ++ enable_nls="yes" ++ # This is here so that -liconv ends up in LIBS ++ # if it worked with -liconv. ++ AC_CHECK_LIB(iconv, libiconv_open) ++ ], ++ [ ++ AC_MSG_WARN([bindtextdomain() not found. Disabling NLS.]) ++ enable_nls="no" ++ ], -liconv) ++ fi ++ if test "$enable_nls" = "yes"; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [Define to 1 if translation of program messages to the user's ++ native language is requested.]) ++ USE_NLS="yes" ++ fi ++ fi ++fi ++ ++AH_BOTTOM([ ++/* Indicate to translators that string X should be translated. Do not look ++ up the translation at run time; just expand to X. This macro is suitable ++ for use where a constant string is required at compile time. */ ++#define N_(x) x ++/* Indicate to translators that we have decided the string X should not be ++ translated. Expand to X. */ ++#define U_(x) x ++#ifdef ENABLE_NLS ++#include <locale.h> ++#include <libintl.h> ++/* Indicate to translators that string X should be translated. At run time, ++ look up and return the translation of X. */ ++#define _(x) dgettext(PACKAGE_NAME, x) ++/* Indicate to translators that strings X1 and X2 are singular and plural ++ forms of the same message, and should be translated. At run time, return ++ an appropriate translation depending on the number N. */ ++#define Q_(x1, x2, n) dngettext(PACKAGE_NAME, x1, x2, n) ++#else ++#define _(x) (x) ++#define Q_(x1, x2, n) (((n) == 1) ? x1 : x2) ++#define gettext(x) (x) ++#define dgettext(domain, x) (x) ++#endif *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306191729.r5JHTjZk004160>