Deleted Added
full compact
configure.ac (251886) configure.ac (253734)
1dnl Licensed to the Apache Software Foundation (ASF) under one
2dnl or more contributor license agreements. See the NOTICE file
3dnl distributed with this work for additional information
4dnl regarding copyright ownership. The ASF licenses this file
5dnl to you under the Apache License, Version 2.0 (the
6dnl "License"); you may not use this file except in compliance
7dnl with the License. You may obtain a copy of the License at
8dnl

--- 446 unchanged lines hidden (view full) ---

455 SVN_FS_WANT_DB_PATCH=25
456 ;;
457*)
458 SVN_FS_WANT_DB_MAJOR=4
459 SVN_FS_WANT_DB_MINOR=0
460 SVN_FS_WANT_DB_PATCH=14
461 ;;
462esac
1dnl Licensed to the Apache Software Foundation (ASF) under one
2dnl or more contributor license agreements. See the NOTICE file
3dnl distributed with this work for additional information
4dnl regarding copyright ownership. The ASF licenses this file
5dnl to you under the Apache License, Version 2.0 (the
6dnl "License"); you may not use this file except in compliance
7dnl with the License. You may obtain a copy of the License at
8dnl

--- 446 unchanged lines hidden (view full) ---

455 SVN_FS_WANT_DB_PATCH=25
456 ;;
457*)
458 SVN_FS_WANT_DB_MAJOR=4
459 SVN_FS_WANT_DB_MINOR=0
460 SVN_FS_WANT_DB_PATCH=14
461 ;;
462esac
463db_alt_version="5.x"
463# Look for libdb4.so first:
464SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
465 $SVN_FS_WANT_DB_PATCH, [db4 db])
466
467AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR,
468 [The desired major version for the Berkeley DB])
469AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MINOR, $SVN_FS_WANT_DB_MINOR,
470 [The desired minor version for the Berkeley DB])

--- 641 unchanged lines hidden (view full) ---

1112 dnl Remove all optimization flags
1113 AC_MSG_NOTICE([Disabling optimizations])
1114 CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
1115 CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
1116# elif test "$enable_optimization" = "maybe" ; then
1117# # do nothing
1118fi
1119
464# Look for libdb4.so first:
465SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
466 $SVN_FS_WANT_DB_PATCH, [db4 db])
467
468AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR,
469 [The desired major version for the Berkeley DB])
470AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MINOR, $SVN_FS_WANT_DB_MINOR,
471 [The desired minor version for the Berkeley DB])

--- 641 unchanged lines hidden (view full) ---

1113 dnl Remove all optimization flags
1114 AC_MSG_NOTICE([Disabling optimizations])
1115 CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
1116 CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
1117# elif test "$enable_optimization" = "maybe" ; then
1118# # do nothing
1119fi
1120
1121dnl Dump the current compiler options
1122AC_MSG_NOTICE([C compiler flags: $CFLAGS])
1123AC_MSG_NOTICE([ user-defined: $CUSERFLAGS])
1124AC_MSG_NOTICE([ maintainer-mode: $CMAINTAINERFLAGS])
1125AC_MSG_NOTICE([C++ compiler flags: $CXXFLAGS])
1126AC_MSG_NOTICE([ user-defined: $CXXUSERFLAGS])
1127AC_MSG_NOTICE([ maintainer-mode: $CXXMAINTAINERFLAGS])
1120
1121AC_ARG_ENABLE(full-version-match,
1122AS_HELP_STRING([--disable-full-version-match],
1123 [Disable the full version match rules when checking
1124 Subversion library compatibility.]),
1125[
1126 if test "$enableval" = "no" ; then
1127 AC_MSG_NOTICE([Disabling svn full version matching])

--- 371 unchanged lines hidden (view full) ---

1499AC_OUTPUT
1500
1501# ==== Print final messages to user ==========================================
1502
1503dnl Configure is long - users tend to miss warnings printed during it.
1504dnl Hence, print a warnings about what we did and didn't configure at the
1505dnl end, where people will actually see them.
1506
1128
1129AC_ARG_ENABLE(full-version-match,
1130AS_HELP_STRING([--disable-full-version-match],
1131 [Disable the full version match rules when checking
1132 Subversion library compatibility.]),
1133[
1134 if test "$enableval" = "no" ; then
1135 AC_MSG_NOTICE([Disabling svn full version matching])

--- 371 unchanged lines hidden (view full) ---

1507AC_OUTPUT
1508
1509# ==== Print final messages to user ==========================================
1510
1511dnl Configure is long - users tend to miss warnings printed during it.
1512dnl Hence, print a warnings about what we did and didn't configure at the
1513dnl end, where people will actually see them.
1514
1507if test "$svn_lib_berkeley_db" = "no" && test "$with_berkeley_db" != "no"; then
1508 db_version="$SVN_FS_WANT_DB_MAJOR.$SVN_FS_WANT_DB_MINOR.$SVN_FS_WANT_DB_PATCH"
1509 AC_MSG_WARN([we have configured without BDB filesystem support
1515if test "$svn_have_berkeley_db" = "no6" && test "$enable_bdb6" != "no"; then
1516 AC_MSG_WARN([We have configured without BDB filesystem support
1510
1511
1517
1518
1512You don't seem to have Berkeley DB version $db_version or newer
1513installed and linked to APR-UTIL. We have created a Makefile which will build
1514Subversion without support for the Berkeley DB back-end. You can find the
1515latest version of Berkeley DB here:
1519Berkeley DB 6 was found, but not used. Please re-run configure (see
1520./config.nice) with the '--enable-bdb6' flag to use it,
1521or explicitly specify '--disable-bdb6' or '--without-berkeley-db'
1522to silence this warning.
1516
1523
1517 http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
1524Please note that some versions of Berkeley DB 6+ are under the GNU Affero
1525General Public License, version 3:
1526https://oss.oracle.com/pipermail/bdb/2013-June/000056.html
1518
1527
1519or explicitly specify --without-berkeley-db to silence this warning.
1528The AGPL-3.0 licence may impose special requirements for making available
1529source code of server-side software. The text of the licence is:
1530https://www.gnu.org/licenses/agpl-3.0.html
1531http://opensource.org/licenses/AGPL-3.0
1532
1533The Berkeley DB backend to Subversion is deprecated; see
1534http://subversion.apache.org/docs/release-notes/1.8#bdb-deprecated
1535
1536The Subversion developers have not tested Subversion with Berkeley DB 6 for
1537technical problems or bugs.
1520])
1521fi
1538])
1539fi