From f885a1076dc98e793dc1d6f4b788b6221812e914 Mon Sep 17 00:00:00 2001 From: fake Date: Wed, 16 Feb 2005 15:40:26 +0000 Subject: [PATCH] fake: bdb: with pre-forking in place, the default selection has top be altered. we can't assume bdb41 is there. also the menu isn't displayed anymore if just pkgcheck bdb is used. i removed the option to select which versions to build, that's now a package selection thing. with just one option left, no need for a submenu. [2005012811503613462] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5614 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/bdb/subconfig-libs.in | 39 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/package/base/bdb/subconfig-libs.in b/package/base/bdb/subconfig-libs.in index aab94c23c..a7b9c449a 100644 --- a/package/base/bdb/subconfig-libs.in +++ b/package/base/bdb/subconfig-libs.in @@ -20,28 +20,29 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -if pkgcheck bdb=bdb33 X +if pkgcheck bdb=bdb33 X || pkgcheck bdb=bdb40 X || pkgcheck bdb=bdb41 X || pkgcheck bdb=bdb42 X then - menu_begin MENU_PKG_BDB 'BerkleyDB Options' - block_begin 4 - bool 'Build v3.3' ROCKCFG_PKG_BDB33 1 - [ "$ROCKCFG_PKG_BDB33" = 1 ] && pkgenable bdb=bdb33 || pkgdisable bdb=bdb33 - [ "$ROCKCFG_PKG_BDB33" = 1 ] && bdbdefselect="$bdbdefselect bdb33 'Using v3.3 as default'" + comment '- BerkleyDB default selection' - bool 'Build v4.0' ROCKCFG_PKG_BDB40 1 - [ "$ROCKCFG_PKG_BDB40" = 1 ] && pkgenable bdb=bdb40 || pkgdisable bdb=bdb40 - [ "$ROCKCFG_PKG_BDB40" = 1 ] && bdbdefselect="$bdbdefselect bdb40 'Using v4.0 as default'" + # we choose to select the newest bdb availible as default + if pkgcheck bdb=bdb33 X ; then + bdbdefselect="$bdbdefselect bdb33 'Using v3.3 as default'" + bdbdefault="bdb33"; + fi; + if pkgcheck bdb=bdb40 X ; then + bdbdefselect="$bdbdefselect bdb40 'Using v4.0 as default'" + bdbdefault="bdb40"; + fi + if pkgcheck bdb=bdb41 X ; then + bdbdefselect="$bdbdefselect bdb41 'Using v4.1 as default'" + bdbdefault="bdb41"; + fi + if pkgcheck bdb=bdb42 X ; then + bdbdefselect="$bdbdefselect bdb42 'Using v4.2 as default'" + bdbdefault="bdb42"; + fi - bool 'Build v4.1' ROCKCFG_PKG_BDB41 1 - [ "$ROCKCFG_PKG_BDB41" = 1 ] && pkgenable bdb=bdb41 || pkgdisable bdb=bdb41 - [ "$ROCKCFG_PKG_BDB41" = 1 ] && bdbdefselect="$bdbdefselect bdb41 'Using v4.1 as default'" + eval "choice ROCKCFG_PKG_BDB_DEFAULT $bdbdefault $bdbdefselect" - bool 'Build v4.2' ROCKCFG_PKG_BDB42 1 - [ "$ROCKCFG_PKG_BDB42" = 1 ] && pkgenable bdb=bdb42 || pkgdisable bdb=bdb42 - [ "$ROCKCFG_PKG_BDB42" = 1 ] && bdbdefselect="$bdbdefselect bdb42 'Using v4.2 as default'" - - eval "choice ROCKCFG_PKG_BDB_DEFAULT bdb41 $bdbdefselect" - block_end - menu_end pkgremove bdb fi