Commit 5574b7c8 authored by Stefan Sperling's avatar Stefan Sperling Committed by Sebastien Granjoux

bgo #709752 - Don't require neon library for Subversion 1.8

parent afd7a0ed
......@@ -58,6 +58,7 @@ GI_REQUIRED=0.9.5
dnl Subversion plugin
NEON_REQUIRED=0.28.2
SERF_REQUIRED=1.2.0
SVN_MAJOR=1
SVN_MINOR=5
SVN_PATCH=0
......@@ -653,6 +654,7 @@ fi
dnl ******************************************************************
dnl Check for extra libs required by subversion.
dnl FIXME: This should actually be done by subversion and not by us.
dnl See http://subversion.tigris.org/issues/show_bug.cgi?id=4435
dnl ******************************************************************
AC_ARG_ENABLE(plugin-subversion,
......@@ -662,6 +664,20 @@ AC_ARG_ENABLE(plugin-subversion,
fi ],
[ user_disabled_subversion=0 ] )
AC_ARG_ENABLE(neon,
AS_HELP_STRING([--disable-neon],[Disable neon support in Subversion plugin]),
[ if test "$enableval" = "no"; then
user_disabled_neon=1
fi ],
[ user_disabled_neon=0 ])
AC_ARG_ENABLE(serf,
AS_HELP_STRING([--disable-serf],[Disable serf support in Subversion plugin]),
[ if test "$enableval" = "no"; then
user_disabled_serf=1
fi ],
[ user_disabled_serf=0 ])
AC_MSG_CHECKING(if subversion support is disabled)
if test "$user_disabled_subversion" = 1; then
AC_MSG_RESULT(yes)
......@@ -692,14 +708,25 @@ if test -n "$SVN_INCLUDE" ; then
SVN_INCLUDE=""
fi
dnl -----------------------------------------
dnl NEON. Required by subversion (devel)
dnl------------------------------------------
have_neon=no
PKG_CHECK_MODULES(NEON, \
neon, have_neon=yes, have_neon=no)
if test x"$have_neon" = "xno"; then
SVN_INCLUDE=""
dnl ----------------------------------------------------------
dnl NEON/SERF. Required by subversion (devel) for HTTP support
dnl-----------------------------------------------------------
# Subversion <= 1.7 relies on neon (recommended) or serf.
# Subversion 1.8 dropped neon support and uses serf to talk
# to HTTP servers.
#
# Subversion can be built without HTTP client support so neon and
# serf aren't hard requirements. But if present on the system
# it is reasonable to assume that Subversion is linked to them.
if test "$user_disabled_neon" = 0; then
have_neon=no
PKG_CHECK_MODULES(NEON, \
neon, have_neon=yes, have_neon=no)
fi
if test "$user_disabled_serf" = 0; then
have_serf=no
PKG_CHECK_MODULES(SERF, \
serf-1, have_serf=yes, have_serf=no)
fi
dnl Make sure our SVN version is high enough
......@@ -730,11 +757,11 @@ dnl ------------------------------------------
if test -n "$SVN_INCLUDE" ; then
SVN_INCLUDE="-I$SVN_INCLUDE"
if test x != "x$SVN_LIB" ; then
SVN_LIB="-L$SVN_LIB $APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
SVN_LIB="-L$SVN_LIB $APR_LIBS $APR_UTILS_LIBS $NEON_LIBS $SERF_LIBS -lsvn_client-1 -lsvn_subr-1"
else
SVN_LIB="$APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
SVN_LIB="$APR_LIBS $APR_UTILS_LIBS $NEON_LIBS $SERF_LIBS -lsvn_client-1 -lsvn_subr-1"
fi
SVN_CFLAGS="$APR_CFLAGS $APR_UTILS_CFLAGS $NEON_CFLAGS"
SVN_CFLAGS="$APR_CFLAGS $APR_UTILS_CFLAGS $NEON_CFLAGS $SERF_CFLAGS"
fi
AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment