Author: stsp
Date: Wed Jun 20 17:45:30 2012
New Revision: 1352231

URL: http://svn.apache.org/viewvc?rev=1352231&view=rev
Log:
* configure.ac: Allow --with-expat=builtin, to support use of APR-util's
   built-in expat with Subversion.

Patch by: Daniel Richard G. <[email protected]>
(with comment tweaks by me)

Modified:
    subversion/trunk/configure.ac

Modified: subversion/trunk/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1352231&r1=1352230&r2=1352231&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Wed Jun 20 17:45:30 2012
@@ -373,6 +373,11 @@ AC_ARG_WITH(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=""


Reply via email to