Author: brane
Date: Fri Dec 21 23:26:11 2012
New Revision: 1425191
URL: http://svn.apache.org/viewvc?rev=1425191&view=rev
Log:
[On the tweak-build-take-two branch]
Minor fix in SQLite configury for amalgamated build.
* build/ac-macros/sqlite.m4: If using amalgamation, do not set additional
include paths for SQLite, since they are now unnecessary.
Modified:
subversion/branches/tweak-build-take-two/build/ac-macros/sqlite.m4
Modified: subversion/branches/tweak-build-take-two/build/ac-macros/sqlite.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/tweak-build-take-two/build/ac-macros/sqlite.m4?rev=1425191&r1=1425190&r2=1425191&view=diff
==============================================================================
--- subversion/branches/tweak-build-take-two/build/ac-macros/sqlite.m4
(original)
+++ subversion/branches/tweak-build-take-two/build/ac-macros/sqlite.m4 Fri Dec
21 23:26:11 2012
@@ -195,10 +195,12 @@ AC_DEFUN(SVN_SQLITE_FILE_CONFIG,
SQLITE_VERSION_OKAY
#endif],
[AC_MSG_RESULT([amalgamation found and is okay])
+ dnl No additional include dirs since sources use a
+ dnl relative path to include the amalgamated files.
+ SVN_SQLITE_INCLUDES=""
_SVN_SQLITE_DSO_LIBS
AC_DEFINE(SVN_SQLITE_INLINE, 1,
[Defined if svn should use the amalgamated version of
sqlite])
- SVN_SQLITE_INCLUDES="-I`dirname $sqlite_amalg`"
if test -n "$svn_sqlite_dso_ldflags"; then
SVN_SQLITE_LIBS="$svn_sqlite_dso_ldflags -lpthread"
else
