| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | Set the DB 6 version to match oe-core db 6.0.30 |
| 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 | @@ -2049,10 +2049,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
| 12 | ]])], |
| 13 | [RPM_CHECK_LIB( |
| 14 | [Berkeley-DB], [db], |
| 15 | - [db-6.1], [db_create], [db.h], |
| 16 | + [db-6.0], [db_create], [db.h], |
| 17 | [yes,external], [db6], |
| 18 | [ DBLIBSRCS="$DBLIBSRCS db3.c" |
| 19 | - DBXY=db61 |
| 20 | + DBXY=db60 |
| 21 | AM_CONDITIONAL(WITH_DB, [ true ]) |
| 22 | AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) |
| 23 | if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then |
| 24 | @@ -2085,7 +2085,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
| 25 | ]) |
| 26 | ]) |
| 27 | |
| 28 | -if test ".$ac_cv_lib_db_6_1_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then |
| 29 | +if test ".$ac_cv_lib_db_6_0_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then |
| 30 | CPPFLAGS="${CPPFLAGS_save}" |
| 31 | fi |
| 32 | |
| 33 | @@ -2097,11 +2097,11 @@ RPM_CHECK_LIB( |
| 34 | [ DBLIBSRCS="$DBLIBSRCS sqlite.c" ], |
| 35 | []) |
| 36 | |
| 37 | -dnl # Sqlite 3.8.3.1 from db-6.1.19 |
| 38 | -if test ".$ac_cv_lib_db_6_1_db_create" = .yes; then |
| 39 | +dnl # Sqlite 3.8.3.1 from db-6.0.30 |
| 40 | +if test ".$ac_cv_lib_db_6_0_db_create" = .yes; then |
| 41 | RPM_CHECK_LIB( |
| 42 | [Berkeley-DB (+SQLite3)], [dbsql], |
| 43 | - [db_sql-6.1], [sqlite3_open], [dbsql.h], |
| 44 | + [db_sql-6.0], [sqlite3_open], [dbsql.h], |
| 45 | [yes,external], [db6/sql], |
| 46 | [ |
| 47 | AM_CONDITIONAL(WITH_DBSQL, [ true ]) |
| 48 | @@ -2253,7 +2253,7 @@ AC_SUBST(WITH_RUBY_CPPFLAGS) |
| 49 | AC_SUBST(WITH_RUBY_SUBDIR) |
| 50 | AC_SUBST(WITH_RUBY_VENDORARCHDIR) |
| 51 | |
| 52 | -dnl # Java prerequisites (swiped from db-6.1.19/dist/aclocal_java et al) |
| 53 | +dnl # Java prerequisites (swiped from db-6.0.30/dist/aclocal_java et al) |
| 54 | WITH_JAVA=no |
| 55 | AC_ARG_WITH([java], |
| 56 | AS_HELP_STRING([--with-java], [build RPM with java support]), |