subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1501079 - in /subversion/branches/1.8.x: ./ STATUS build/ac-macros/sqlite.m4
Date Tue, 09 Jul 2013 04:01:08 GMT
Author: svn-role
Date: Tue Jul  9 04:01:08 2013
New Revision: 1501079

URL: http://svn.apache.org/r1501079
Log:
Merge the r1499034 group from trunk:

 * r1499034, r1500175
   sqlite3.m4: allow placing the amalgamation in the build dir.
   Justification:
     It is not present in the extracted source tarball, so doesn't belong in
     the source dir.
   Votes:
     +1: danielsh, breser, stefan2

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/build/ac-macros/sqlite.m4

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1499034,1500175

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501079&r1=1501078&r2=1501079&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  9 04:01:08 2013
@@ -120,14 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1499034, r1500175
-   sqlite3.m4: allow placing the amalgamation in the build dir.
-   Justification:
-     It is not present in the extracted source tarball, so doesn't belong in
-     the source dir.
-   Votes:
-     +1: danielsh, breser, stefan2
-
  * r1488693, r1490721, r1500904
    (Perl bindings) Documentation fixes: document some SVN::Client methods
    and at least list all wrapped -though still undocumented - methods.

Modified: subversion/branches/1.8.x/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/ac-macros/sqlite.m4?rev=1501079&r1=1501078&r2=1501079&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/1.8.x/build/ac-macros/sqlite.m4 Tue Jul  9 04:01:08 2013
@@ -78,6 +78,10 @@ AC_DEFUN(SVN_LIB_SQLITE,
     SVN_SQLITE_FILE_CONFIG($abs_srcdir/sqlite-amalgamation/sqlite3.c)
 
     if test -z "$svn_lib_sqlite"; then
+      SVN_SQLITE_FILE_CONFIG($abs_builddir/sqlite-amalgamation/sqlite3.c)
+    fi
+
+    if test -z "$svn_lib_sqlite"; then
       dnl check the "standard" location of /usr
       SVN_SQLITE_DIR_CONFIG()
     fi
@@ -246,6 +250,10 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
   echo "unpack the archive using unzip and rename the resulting"
   echo "directory to:"
   echo "$abs_srcdir/sqlite-amalgamation"
+  if test x"$abs_srcdir" != x"$abs_builddir"; then
+    echo "or to:"
+    echo "$abs_builddir/sqlite-amalgamation"
+  fi
   echo ""
   AC_MSG_ERROR([Subversion requires SQLite])
 ])



Mime
View raw message