svn commit: r1302554 - in /subversion/trunk: build/ac-macros/serf.m4 configure.ac

[gs...@apache.org]

Author: gstein
Date: Mon Mar 19 17:34:55 2012
New Revision: 1302554

URL: http://svn.apache.org/viewvc?rev=1302554&view=rev
Log:
Require a minimum of serf 1.0.x, though this will switch to 1.1.x
shortly. Remove in-tree builds, in favor of an installed library.

* configure.ac: update minimum serf version to 1.0.0

* build/ac-macros/serf.m4:
  (SVN_LIB_SERF): adjust help string, remove serf-0, and remove the
    in-tree ("reconfig") builds

Modified:
    subversion/trunk/build/ac-macros/serf.m4
    subversion/trunk/configure.ac

Modified: subversion/trunk/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?rev=1302554&r1=1302553&r2=1302554&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/serf.m4 (original)
+++ subversion/trunk/build/ac-macros/serf.m4 Mon Mar 19 17:34:55 2012
@@ -32,14 +32,14 @@ AC_DEFUN(SVN_LIB_SERF,
   serf_check_patch="$3"
 
   AC_ARG_WITH(serf,AS_HELP_STRING([--with-serf=PREFIX],
-                                  [Serf WebDAV client library]),
+                                  [Serf HTTP client library]),
   [
     if test "$withval" = "yes" ; then
       AC_MSG_ERROR([--with-serf requires an argument.])
     elif test "$withval" != "no" ; then
       AC_MSG_NOTICE([serf library configuration])
       serf_prefix=$withval
-      for serf_major in serf-2 serf-1 serf-0; do
+      for serf_major in serf-2 serf-1; do
         if ! test -d $serf_prefix/include/$serf_major; then continue; fi
         save_cppflags="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/$serf_major"
@@ -62,20 +62,7 @@ AC_DEFUN(SVN_LIB_SERF,
         test $serf_found = yes && break
       done
     fi
-  ], [
-       if test -d "$srcdir/serf"; then
-         serf_found=reconfig
-       fi
-     ])
-
-
-  if test $serf_found = "reconfig"; then
-    SVN_EXTERNAL_PROJECT([serf], [--with-apr=$apr_config --with-apr-util=$apu_config])
-    serf_major=serf-`$srcdir/serf/build/get-version.sh major $srcdir/serf/serf.h SERF`
-    serf_prefix=$prefix
-    SVN_SERF_INCLUDES="-I$srcdir/serf"
-    SVN_SERF_LIBS="$abs_builddir/serf/lib$serf_major.la"
-  fi
+  ])
 
   if test $serf_found = "yes"; then
     SVN_SERF_INCLUDES="-I$serf_prefix/include/$serf_major"
@@ -85,8 +72,6 @@ AC_DEFUN(SVN_LIB_SERF,
       SVN_SERF_LIBS="-l$serf_major"
       LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
     fi
-  elif test $serf_found = "reconfig"; then
-    serf_found=yes
   fi
 
   svn_lib_serf=$serf_found

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1302554&r1=1302553&r2=1302554&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Mar 19 17:34:55 2012
@@ -138,7 +138,7 @@ if test "$svn_lib_neon" = "yes"; then
 fi
 
 dnl Search for serf as an alternative to neon
-SVN_LIB_SERF(0,7,1)
+SVN_LIB_SERF(1,0,0)
 
 if test "$svn_lib_serf" = "yes"; then
   AC_DEFINE([SVN_HAVE_SERF], 1,