Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Support both db5 and db6. |
| 2 | |
| 3 | Upstream-Status: Inappropriate [configuration] |
| 4 | |
| 5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 6 | |
| 7 | Index: rpm/configure.ac |
| 8 | =================================================================== |
| 9 | --- rpm.orig/configure.ac |
| 10 | +++ rpm/configure.ac |
| 11 | @@ -547,8 +547,6 @@ else |
| 12 | MYPATH=$PATH |
| 13 | fi |
| 14 | |
| 15 | -DBXY=db60 |
| 16 | - |
| 17 | AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH) |
| 18 | AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH) |
| 19 | AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH) |
| 20 | @@ -560,22 +558,6 @@ AC_PATH_PROG(__CMAKE, cmake, %{_bindir}/ |
| 21 | AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH) |
| 22 | AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH) |
| 23 | AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH) |
| 24 | -AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive, $MYPATH) |
| 25 | -AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint, %{_bindir}/${DBXY}_checkpoint, $MYPATH) |
| 26 | -AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock, $MYPATH) |
| 27 | -AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH) |
| 28 | -AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup, %{_bindir}/${DBXY}_hotbackup, $MYPATH) |
| 29 | -AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH) |
| 30 | -AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify, %{_bindir}/${DBXY}_log_verify, $MYPATH) |
| 31 | -AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog, $MYPATH) |
| 32 | -AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover, $MYPATH) |
| 33 | -AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate, %{_bindir}/${DBXY}_replicate, $MYPATH) |
| 34 | -AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH) |
| 35 | -AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen, %{_bindir}/${DBXY}_sql_codegen, $MYPATH) |
| 36 | -AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH) |
| 37 | -AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH) |
| 38 | -AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade, $MYPATH) |
| 39 | -AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH) |
| 40 | AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) |
| 41 | AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) |
| 42 | AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) |
| 43 | @@ -1604,13 +1586,18 @@ RPM_CHECK_LIB( |
| 44 | |
| 45 | dnl # Berkeley-DB & SQLite |
| 46 | DBLIBSRCS="" |
| 47 | +DBXY=db |
| 48 | + |
| 49 | # XXX won't handle --includedir override |
| 50 | -CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}" |
| 51 | +CPPFLAGS_save="${CPPFLAGS}" |
| 52 | +CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-6.0" |
| 53 | +with_db_save="${with_db}" |
| 54 | RPM_CHECK_LIB( |
| 55 | [Berkeley-DB], [db], |
| 56 | [db-6.0], [db_create], [db.h], |
| 57 | - [yes,external], [db3], |
| 58 | + [yes,external], [db6], |
| 59 | [ DBLIBSRCS="$DBLIBSRCS db3.c" |
| 60 | + DBXY=db60 |
| 61 | AM_CONDITIONAL(WITH_DB, [ true ]) |
| 62 | AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) |
| 63 | if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then |
| 64 | @@ -1619,10 +1606,32 @@ RPM_CHECK_LIB( |
| 65 | WITH_DB_SUBDIR="" |
| 66 | fi |
| 67 | ], |
| 68 | - [ AM_CONDITIONAL(WITH_DB, [ false ]) |
| 69 | - AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ]) |
| 70 | + [ # Reset a few variables to fresh |
| 71 | + with_db="${with_db_save}" |
| 72 | + CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-5.3" |
| 73 | + RPM_CHECK_LIB( |
| 74 | + [Berkeley-DB], [db], |
| 75 | + [db-5.3], [db_create], [db.h], |
| 76 | + [yes,external], [db53], |
| 77 | + [ DBLIBSRCS="$DBLIBSRCS db3.c" |
| 78 | + DBXY=db53 |
| 79 | + AM_CONDITIONAL(WITH_DB, [ true ]) |
| 80 | + AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) |
| 81 | + if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then |
| 82 | + AC_DEFINE(HAVE_DB_H, 1, [Have <db.h> header]) |
| 83 | + else |
| 84 | + WITH_DB_SUBDIR="" |
| 85 | + fi |
| 86 | + ], |
| 87 | + [ AM_CONDITIONAL(WITH_DB, [ false ]) |
| 88 | + AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ]) |
| 89 | + ]) |
| 90 | ]) |
| 91 | |
| 92 | +if test ".$ac_cv_lib_db_6_0_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then |
| 93 | + CPPFLAGS="${CPPFLAGS_save}" |
| 94 | +fi |
| 95 | + |
| 96 | dnl # Sqlite external |
| 97 | RPM_CHECK_LIB( |
| 98 | [SQLite], [sqlite], |
| 99 | @@ -1633,10 +1642,11 @@ RPM_CHECK_LIB( |
| 100 | |
| 101 | dnl # Sqlite 3.7.0.1 from db-5.1.19 |
| 102 | dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS. |
| 103 | +if test ".$ac_cv_lib_db_6_0_db_create" = .yes; then |
| 104 | RPM_CHECK_LIB( |
| 105 | [Berkeley-DB (+SQLite3)], [dbsql], |
| 106 | [db_sql-6.0], [sqlite3_open], [dbsql.h], |
| 107 | - [yes,external], [db3/sql], |
| 108 | + [yes,external], [db6/sql], |
| 109 | [ |
| 110 | AM_CONDITIONAL(WITH_DBSQL, [ true ]) |
| 111 | AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library]) |
| 112 | @@ -1650,12 +1660,50 @@ RPM_CHECK_LIB( |
| 113 | ], [ |
| 114 | AM_CONDITIONAL(WITH_DBSQL, [ false ]) |
| 115 | ]) |
| 116 | +elif test ".$ac_cv_lib_db_5_3_db_create" = .yes; then |
| 117 | +RPM_CHECK_LIB( |
| 118 | + [Berkeley-DB (+SQLite3)], [dbsql], |
| 119 | + [db_sql-5.3], [sqlite3_open], [dbsql.h], |
| 120 | + [yes,external], [db53/sql], |
| 121 | + [ |
| 122 | + AM_CONDITIONAL(WITH_DBSQL, [ true ]) |
| 123 | + AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library]) |
| 124 | + if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then |
| 125 | + WITH_DB_CPPFLAGS="${WITH_DB_CPPFLAGS} -I\$(top_srcdir)/db/sql/generated" |
| 126 | + WITH_DB_LIBS="${WITH_DBSQL_LIBS}" |
| 127 | + DBLIBSRCS="$DBLIBSRCS sqlite.c" |
| 128 | + else |
| 129 | + WITH_DBSQL_SUBDIR="" |
| 130 | + fi |
| 131 | + ], [ |
| 132 | + AM_CONDITIONAL(WITH_DBSQL, [ false ]) |
| 133 | + ]) |
| 134 | +else |
| 135 | +AM_CONDITIONAL(WITH_DBSQL, [ false ]) |
| 136 | +fi |
| 137 | |
| 138 | DBLIBOBJS=`echo $DBLIBSRCS | sed -e "s/\.c/\.lo/g"` |
| 139 | |
| 140 | AC_SUBST(DBLIBSRCS) |
| 141 | AC_SUBST(DBLIBOBJS) |
| 142 | |
| 143 | +AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive, $MYPATH) |
| 144 | +AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint, %{_bindir}/${DBXY}_checkpoint, $MYPATH) |
| 145 | +AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock, $MYPATH) |
| 146 | +AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH) |
| 147 | +AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup, %{_bindir}/${DBXY}_hotbackup, $MYPATH) |
| 148 | +AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH) |
| 149 | +AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify, %{_bindir}/${DBXY}_log_verify, $MYPATH) |
| 150 | +AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog, $MYPATH) |
| 151 | +AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover, $MYPATH) |
| 152 | +AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate, %{_bindir}/${DBXY}_replicate, $MYPATH) |
| 153 | +AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH) |
| 154 | +AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen, %{_bindir}/${DBXY}_sql_codegen, $MYPATH) |
| 155 | +AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH) |
| 156 | +AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH) |
| 157 | +AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade, $MYPATH) |
| 158 | +AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH) |
| 159 | + |
| 160 | AC_ARG_WITH(db-largefile, AS_HELP_STRING([--with-db-largefile], [build Berkeley-DB with LARGEFILE support])) |
| 161 | AC_ARG_WITH(db-mutex, AS_HELP_STRING([--with-db-mutex=ARG], [build Berkeley-DB with MUTEX type ARG])) |
| 162 | |