|
Line
Link Here
|
| 0 |
-- subversion-1.8.1/build/ac-macros/berkeley-db.m4 |
0 |
++ subversion-1.8.1/build/ac-macros/berkeley-db.m4 |
|
Lines 48-54
Link Here
|
| 48 |
AC_ARG_WITH(berkeley-db, [AS_HELP_STRING( |
48 |
AC_ARG_WITH(berkeley-db, [AS_HELP_STRING( |
| 49 |
[[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]], [ |
49 |
[[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]], [ |
| 50 |
The Subversion Berkeley DB based filesystem library |
50 |
The Subversion Berkeley DB based filesystem library |
| 51 |
requires Berkeley DB $db_version or $db_alt_version. If you |
51 |
requires Berkeley DB $db_version or newer. If you |
| 52 |
specify `--without-berkeley-db', that library will |
52 |
specify `--without-berkeley-db', that library will |
| 53 |
not be built. If you omit the argument of this option |
53 |
not be built. If you omit the argument of this option |
| 54 |
completely, the configure script will use Berkeley DB |
54 |
completely, the configure script will use Berkeley DB |
|
Lines 126-160
Link Here
|
| 126 |
svn_lib_berkeley_db=no |
126 |
svn_lib_berkeley_db=no |
| 127 |
else |
127 |
else |
| 128 |
AC_MSG_CHECKING([for availability of Berkeley DB]) |
128 |
AC_MSG_CHECKING([for availability of Berkeley DB]) |
| 129 |
AC_ARG_ENABLE(bdb6, |
129 |
SVN_LIB_BERKELEY_DB_TRY($1, $2, $3) |
| 130 |
AS_HELP_STRING([--enable-bdb6], |
|
|
| 131 |
[Allow building against BDB 6+. |
| 132 |
See --with-berkeley-db for specifying the location of |
| 133 |
the Berkeley DB installation. Using BDB 6 will fail if |
| 134 |
this option is not used.]), |
| 135 |
[enable_bdb6=$enableval],[enable_bdb6=unspecified]) |
| 136 |
|
| 137 |
SVN_LIB_BERKELEY_DB_TRY($1, $2, $3, $enable_bdb6) |
| 138 |
if test "$svn_have_berkeley_db" = "yes"; then |
130 |
if test "$svn_have_berkeley_db" = "yes"; then |
| 139 |
AC_MSG_RESULT([yes]) |
131 |
AC_MSG_RESULT([yes]) |
| 140 |
svn_lib_berkeley_db=yes |
132 |
svn_lib_berkeley_db=yes |
| 141 |
else |
133 |
else |
| 142 |
if test "$svn_have_berkeley_db" = "no6"; then |
134 |
AC_MSG_RESULT([no]) |
| 143 |
AC_MSG_RESULT([no (found version 6, but --enable-bdb6 not specified)]) |
|
|
| 144 |
# A warning will be printed at the end of configure.ac. |
| 145 |
else |
| 146 |
AC_MSG_RESULT([no]) |
| 147 |
fi |
| 148 |
svn_lib_berkeley_db=no |
135 |
svn_lib_berkeley_db=no |
| 149 |
if test "$bdb_status" = "required"; then |
136 |
if test "$bdb_status" = "required"; then |
| 150 |
AC_MSG_ERROR([Berkeley DB $db_version or $db_alt_version wasn't found.]) |
137 |
AC_MSG_ERROR([Berkeley DB $db_version or newer't found.]) |
| 151 |
fi |
138 |
fi |
| 152 |
fi |
139 |
fi |
| 153 |
fi |
140 |
fi |
| 154 |
]) |
141 |
]) |
| 155 |
|
142 |
|
| 156 |
|
143 |
|
| 157 |
dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch, enable_bdb6) |
144 |
dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch) |
| 158 |
dnl |
145 |
dnl |
| 159 |
dnl A subroutine of SVN_LIB_BERKELEY_DB. |
146 |
dnl A subroutine of SVN_LIB_BERKELEY_DB. |
| 160 |
dnl |
147 |
dnl |
|
Lines 187-193
Link Here
|
| 187 |
svn_check_berkeley_db_major=$1 |
174 |
svn_check_berkeley_db_major=$1 |
| 188 |
svn_check_berkeley_db_minor=$2 |
175 |
svn_check_berkeley_db_minor=$2 |
| 189 |
svn_check_berkeley_db_patch=$3 |
176 |
svn_check_berkeley_db_patch=$3 |
| 190 |
enable_bdb6=$4 |
|
|
| 191 |
|
177 |
|
| 192 |
if test -z "$SVN_DB_LIBS"; then |
178 |
if test -z "$SVN_DB_LIBS"; then |
| 193 |
# We pass --dbm-libs here since Debian has modified apu-config not |
179 |
# We pass --dbm-libs here since Debian has modified apu-config not |
|
Lines 245-256
Link Here
|
| 245 |
|| patch != DB_VERSION_PATCH) |
231 |
|| patch != DB_VERSION_PATCH) |
| 246 |
exit (1); |
232 |
exit (1); |
| 247 |
|
233 |
|
| 248 |
/* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20 |
|
|
| 249 |
and newer are under the AGPL, and we want use of AGPL dependencies to be |
| 250 |
opt-in. */ |
| 251 |
if (major >= 6 && strcmp("$enable_bdb6", "yes")) |
| 252 |
exit(2); |
| 253 |
|
| 254 |
/* Run-time check: ensure the library claims to be the correct version. */ |
234 |
/* Run-time check: ensure the library claims to be the correct version. */ |
| 255 |
|
235 |
|
| 256 |
if (major < $svn_check_berkeley_db_major) |
236 |
if (major < $svn_check_berkeley_db_major) |
|
Lines 270-280
Link Here
|
| 270 |
} |
250 |
} |
| 271 |
]])], |
251 |
]])], |
| 272 |
[svn_have_berkeley_db=yes], |
252 |
[svn_have_berkeley_db=yes], |
| 273 |
[rc=$? |
253 |
[svn_have_berkeley_db=no], |
| 274 |
svn_have_berkeley_db=no |
|
|
| 275 |
if test $rc = 2; then |
| 276 |
svn_have_berkeley_db=no6 |
| 277 |
fi], |
| 278 |
[svn_have_berkeley_db=yes] |
254 |
[svn_have_berkeley_db=yes] |
| 279 |
) |
255 |
) |
| 280 |
|
256 |
|
