diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-04 15:07:54 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-04 15:07:54 +0000 |
commit | a73e71ff1e7e9605a6a356deb754150183d6b906 (patch) | |
tree | 548e478f6f70019b55bacc485591167d46591add /configure | |
parent | c7832dd1fdbd1c8d3b61cf6e3a3c0606c744bc9b (diff) |
improve configure script to remember the previous value of each dependency in build_tools/menuselect-deps, so that (once it has been written) menuselect can use this information to warn the user when a previously met dependency is no longer met
along the way, change tags used in configure script, menuselect-deps and code for various dependencies to be consistently named
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@154151 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -683,7 +683,7 @@ HOST_CPU HOST_VENDOR HOST_OS OSARCH -WINARCH +PBX_WINARCH UNAME PBX_OSREV CXX @@ -4116,7 +4116,7 @@ HOST_OS=${host_os} -WINARCH=0 +PBX_WINARCH=0 case "${host_os}" in freebsd*) @@ -4133,11 +4133,11 @@ case "${host_os}" in ;; mingw32) OSARCH=mingw32 - WINARCH=1 + PBX_WINARCH=1 ;; cygwin) OSARCH=cygwin - WINARCH=1 + PBX_WINARCH=1 ;; *) OSARCH=${host_os} @@ -50960,6 +50960,16 @@ echo "$as_me: *** including --without-${a}." >&6;} echo "${ECHO_T}ok" >&6; } +if test -f build_tools/menuselect-deps; then + # extract old values of all PBX_ variables from menuselect-deps + # and preserve them so that menuselect can determine whether + # any previously-met dependencies are no longer met and warn + # the user appropriately + while IFS="=:" read var val old_val; do + eval "PBX_${var}=\${PBX_${var}}:${val}" + done < build_tools/menuselect-deps +fi + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -51642,7 +51652,7 @@ HOST_CPU!$HOST_CPU$ac_delim HOST_VENDOR!$HOST_VENDOR$ac_delim HOST_OS!$HOST_OS$ac_delim OSARCH!$OSARCH$ac_delim -WINARCH!$WINARCH$ac_delim +PBX_WINARCH!$PBX_WINARCH$ac_delim UNAME!$UNAME$ac_delim PBX_OSREV!$PBX_OSREV$ac_delim CXX!$CXX$ac_delim |