subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1127192 - /subversion/branches/1.6.x-neon-expat/build/ac-macros/neon.m4
Date Tue, 24 May 2011 18:08:51 GMT
Author: philip
Date: Tue May 24 18:08:51 2011
New Revision: 1127192

URL: http://svn.apache.org/viewvc?rev=1127192&view=rev
Log:
Recent expat releases put files in different places in the build
tree.

This code has been removed from trunk.

* build/ac-macros/neon.m4
  (SVN_LIB_NEON): Try two locations for libexpat.la.

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=1127192&r1=1127191&r2=1127192&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:08:51 2011
@@ -92,9 +92,12 @@ dnl Configure neon ---------------------
 
           # 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/expat.h" ; then
+          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



Mime
View raw message