svn commit: r1127203 - /subversion/branches/1.6.x-neon-expat/build/ac-macros/neon.m4

[ph...@apache.org]

Author: philip
Date: Tue May 24 18:29:56 2011
New Revision: 1127203

URL: http://svn.apache.org/viewvc?rev=1127203&view=rev
Log:
Followup to r1127192, the file libexpat.la is not available when
configure is run so don't look for it.  Neon will often build
without help anyway.

I hate shell/autoconf.

* build/ac-macros/neon.m4
  (SVN_LIB_NEON): Don't pass --with-expat to neon.

Modified:
    subversion/branches/1.6.x-neon-expat/build/ac-macros/neon.m4

Modified: subversion/branches/1.6.x-neon-expat/build/ac-macros/neon.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-neon-expat/build/ac-macros/neon.m4?rev=1127203&r1=1127202&r2=1127203&view=diff
==============================================================================
--- subversion/branches/1.6.x-neon-expat/build/ac-macros/neon.m4 (original)
+++ subversion/branches/1.6.x-neon-expat/build/ac-macros/neon.m4 Tue May 24 18:29:56 2011
@@ -90,14 +90,6 @@ dnl Configure neon ---------------------
             args="--disable-shared"
           fi
 
-          # If we have apr-util and its bundled expat, we can point neon
-          # there, otherwise, neon is on its own to find expat. 
-          if test -f "$abs_builddir/apr-util/xml/expat/lib/libexpat.la" ; then
-            args="$args --with-expat='$abs_builddir/apr-util/xml/expat/lib/libexpat.la'"
-          fi
-          if test -f "$abs_builddir/apr-util/xml/expat/libexpat.la" ; then
-            args="$args --with-expat='$abs_builddir/apr-util/xml/expat/libexpat.la'"
-          fi
           SVN_EXTERNAL_PROJECT([neon], [$args])
 
           if test -f "$abs_builddir/neon/neon-config" ; then