1.1 --- a/config/companion_libs.in	Mon Oct 04 00:16:56 2010 +0200
     1.2 +++ b/config/companion_libs.in	Sun Oct 03 23:10:46 2010 +0200
     1.3 @@ -73,6 +73,11 @@
     1.4  
     1.5  comment "Companion libraries common options"
     1.6  
     1.7 +config COMPLIBS_BACKUP
     1.8 +    bool
     1.9 +    default y
    1.10 +    depends on ! COMPLIBS_SHARED
    1.11 +
    1.12  config COMPLIBS_CHECK
    1.13      bool
    1.14      prompt "Check the companion libraries builds (!!! READ HELP!!!)"

     2.1 --- a/scripts/functions	Mon Oct 04 00:16:56 2010 +0200
     2.2 +++ b/scripts/functions	Sun Oct 03 23:10:46 2010 +0200
     2.3 @@ -1017,9 +1017,7 @@
     2.4                             /^(UID|EUID)=/d;
     2.5                             /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
     2.6  
     2.7 -    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
     2.8 -        # If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
     2.9 -        # so do not save.
    2.10 +    if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
    2.11          CT_DoTarballIfExists "${CT_COMPLIBS_DIR}" "${state_dir}/complibs_dir"
    2.12      fi
    2.13      CT_DoTarballIfExists "${CT_CONFIG_DIR}" "${state_dir}/config_dir"
    2.14 @@ -1060,9 +1058,7 @@
    2.15      CT_DoExtractTarballIfExists "${state_dir}/cc_core_shared_prefix_dir" "${CT_CC_CORE_SHARED_PREFIX_DIR}"
    2.16      CT_DoExtractTarballIfExists "${state_dir}/cc_core_static_prefix_dir" "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    2.17      CT_DoExtractTarballIfExists "${state_dir}/config_dir" "${CT_CONFIG_DIR}"
    2.18 -    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
    2.19 -        # If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
    2.20 -        # so do not restore.
    2.21 +    if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
    2.22          CT_DoExtractTarballIfExists "${state_dir}/complibs_dir" "${CT_COMPLIBS_DIR}"
    2.23      fi
    2.24