Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
along the way, change tags used in configure script, menuselect-deps and code for various dependencies to be consistently named



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@154151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Kevin P. Fleming 17 years ago
parent 46d7e8dafa
commit 448562af93
16 changed files with 56 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
apps/app_osplookup.c
Unescape View File

@ -30,7 +30,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend>osptk</depend> <depend>osptk</depend>
<depend>ssl</depend> <depend>openssl</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"

4
apps/app_voicemail.c
Unescape View File

@ -47,7 +47,7 @@ c-client (http://www.washington.edu/imap/
/*** MAKEOPTS /*** MAKEOPTS
<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_directory.o"> <category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_directory.o">
<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC"> <member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
<depend>unixodbc_or_iodbc</depend> <depend>odbc</depend>
<depend>ltdl</depend> <depend>ltdl</depend>
<use>unixodbc</use> <use>unixodbc</use>
<use>iodbc</use> <use>iodbc</use>
@ -57,7 +57,7 @@ c-client (http://www.washington.edu/imap/
<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4"> <member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
<depend>imap_tk</depend> <depend>imap_tk</depend>
<conflict>ODBC_STORAGE</conflict> <conflict>ODBC_STORAGE</conflict>
<use>ssl</use> <use>openssl</use>
<defaultenabled>no</defaultenabled> <defaultenabled>no</defaultenabled>
</member> </member>
</category> </category>

12
build_tools/menuselect-deps.in
Unescape View File

@ -1,4 +1,4 @@
ASOUND=@PBX_ALSA@ ALSA=@PBX_ALSA@
CRYPTO=@PBX_CRYPTO@ CRYPTO=@PBX_CRYPTO@
CURL=@PBX_CURL@ CURL=@PBX_CURL@
DAHDI=@PBX_DAHDI@ DAHDI=@PBX_DAHDI@
@ -24,11 +24,11 @@ MISDN=@PBX_MISDN@
NBS=@PBX_NBS@ NBS=@PBX_NBS@
NETSNMP=@PBX_NETSNMP@ NETSNMP=@PBX_NETSNMP@
NEWT=@PBX_NEWT@ NEWT=@PBX_NEWT@
UNIXODBC_OR_IODBC=@PBX_ODBC@ ODBC=@PBX_ODBC@
OGG=@PBX_OGG@ OGG=@PBX_OGG@
OPENH323=@PBX_OPENH323@ OPENH323=@PBX_OPENH323@
OSPTK=@PBX_OSPTK@ OSPTK=@PBX_OSPTK@
OSSAUDIO=@PBX_OSS@ OSS=@PBX_OSS@
PGSQL=@PBX_PGSQL@ PGSQL=@PBX_PGSQL@
POPT=@PBX_POPT@ POPT=@PBX_POPT@
PORTAUDIO=@PBX_PORTAUDIO@ PORTAUDIO=@PBX_PORTAUDIO@
@ -43,12 +43,12 @@ SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@
SQLITE3=@PBX_SQLITE3@ SQLITE3=@PBX_SQLITE3@
SQLITE=@PBX_SQLITE@ SQLITE=@PBX_SQLITE@
SS7=@PBX_SS7@ SS7=@PBX_SS7@
SSL=@PBX_OPENSSL@ OPENSSL=@PBX_OPENSSL@
SUPPSERV=@PBX_SUPPSERV@ SUPPSERV=@PBX_SUPPSERV@
TONEZONE=@PBX_TONEZONE@ TONEZONE=@PBX_TONEZONE@
UNIXODBC=@PBX_UNIXODBC@ UNIXODBC=@PBX_UNIXODBC@
USB=@PBX_USB@ USB=@PBX_USB@
VORBIS=@PBX_VORBIS@ VORBIS=@PBX_VORBIS@
VPBAPI=@PBX_VPB@ VPB=@PBX_VPB@
WINARCH=@WINARCH@ WINARCH=@PBX_WINARCH@
ZLIB=@PBX_ZLIB@ ZLIB=@PBX_ZLIB@

2
cdr/cdr_adaptive_odbc.c
Unescape View File

@ -25,7 +25,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>unixodbc_or_iodbc</depend> <depend>odbc</depend>
<use>unixodbc</use> <use>unixodbc</use>
<use>iodbc</use> <use>iodbc</use>
***/ ***/

2
cdr/cdr_odbc.c
Unescape View File

@ -29,7 +29,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>unixodbc_or_iodbc</depend> <depend>odbc</depend>
<depend>ltdl</depend> <depend>ltdl</depend>
<use>unixodbc</use> <use>unixodbc</use>
<use>iodbc</use> <use>iodbc</use>

2
channels/chan_alsa.c
Unescape View File

@ -28,7 +28,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>asound</depend> <depend>alsa</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"

2
channels/chan_oss.c
Unescape View File

@ -34,7 +34,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>ossaudio</depend> <depend>oss</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"

2
channels/chan_usbradio.c
Unescape View File

@ -34,7 +34,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>ossaudio</depend> <depend>oss</depend>
<depend>usb</depend> <depend>usb</depend>
<defaultenabled>no</defaultenabled> <defaultenabled>no</defaultenabled>
***/ ***/

2
channels/chan_vpb.cc
Unescape View File

@ -30,7 +30,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>vpbapi</depend> <depend>vpb</depend>
***/ ***/
#include <vpbapi.h> #include <vpbapi.h>

20
configure vendored
Unescape View File

@ -683,7 +683,7 @@ HOST_CPU
HOST_VENDOR HOST_VENDOR
HOST_OS HOST_OS
OSARCH OSARCH
WINARCH PBX_WINARCH
UNAME UNAME
PBX_OSREV PBX_OSREV
CXX CXX
@ -4116,7 +4116,7 @@ HOST_OS=${host_os}
WINARCH=0 PBX_WINARCH=0
case "${host_os}" in case "${host_os}" in
freebsd*) freebsd*)
@ -4133,11 +4133,11 @@ case "${host_os}" in
;; ;;
mingw32) mingw32)
OSARCH=mingw32 OSARCH=mingw32
WINARCH=1 PBX_WINARCH=1
;; ;;
cygwin) cygwin)
OSARCH=cygwin OSARCH=cygwin
WINARCH=1 PBX_WINARCH=1
;; ;;
*) *)
OSARCH=${host_os} OSARCH=${host_os}
@ -50960,6 +50960,16 @@ echo "$as_me: *** including --without-${a}." >&6;}
echo "${ECHO_T}ok" >&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 cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between 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_VENDOR!$HOST_VENDOR$ac_delim
HOST_OS!$HOST_OS$ac_delim HOST_OS!$HOST_OS$ac_delim
OSARCH!$OSARCH$ac_delim OSARCH!$OSARCH$ac_delim
WINARCH!$WINARCH$ac_delim PBX_WINARCH!$PBX_WINARCH$ac_delim
UNAME!$UNAME$ac_delim UNAME!$UNAME$ac_delim
PBX_OSREV!$PBX_OSREV$ac_delim PBX_OSREV!$PBX_OSREV$ac_delim
CXX!$CXX$ac_delim CXX!$CXX$ac_delim

18
configure.ac
Unescape View File

@ -82,7 +82,7 @@ AC_SUBST(HOST_CPU)
AC_SUBST(HOST_VENDOR) AC_SUBST(HOST_VENDOR)
AC_SUBST(HOST_OS) AC_SUBST(HOST_OS)
WINARCH=0 PBX_WINARCH=0
case "${host_os}" in case "${host_os}" in
freebsd*) freebsd*)
@ -99,11 +99,11 @@ case "${host_os}" in
;; ;;
mingw32) mingw32)
OSARCH=mingw32 OSARCH=mingw32
WINARCH=1 PBX_WINARCH=1
;; ;;
cygwin) cygwin)
OSARCH=cygwin OSARCH=cygwin
WINARCH=1 PBX_WINARCH=1
;; ;;
*) *)
OSARCH=${host_os} OSARCH=${host_os}
@ -111,7 +111,7 @@ case "${host_os}" in
esac esac
AC_SUBST(OSARCH) AC_SUBST(OSARCH)
AC_SUBST(WINARCH) AC_SUBST(PBX_WINARCH)
# check for uname # check for uname
AC_PATH_TOOL([UNAME], [uname], No) AC_PATH_TOOL([UNAME], [uname], No)
@ -1649,6 +1649,16 @@ fi
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile]) AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
AST_CHECK_MANDATORY AST_CHECK_MANDATORY
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
AC_OUTPUT AC_OUTPUT
if test "x${silent}" != "xyes" ; then if test "x${silent}" != "xyes" ; then

2
funcs/func_odbc.c
Unescape View File

@ -27,7 +27,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>unixodbc_or_iodbc</depend> <depend>odbc</depend>
<depend>ltdl</depend> <depend>ltdl</depend>
<depend>res_odbc</depend> <depend>res_odbc</depend>
<use>unixodbc</use> <use>unixodbc</use>

16
makeopts.in
Unescape View File

@ -68,8 +68,8 @@ AST_DECLARATION_AFTER_STATEMENT=@AST_DECLARATION_AFTER_STATEMENT@
AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@ AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@
ASOUND_INCLUDE=@ALSA_INCLUDE@ ALSA_INCLUDE=@ALSA_INCLUDE@
ASOUND_LIB=@ALSA_LIB@ ALSA_LIB=@ALSA_LIB@
CURL_INCLUDE=@CURL_INCLUDE@ CURL_INCLUDE=@CURL_INCLUDE@
CURL_LIB=@CURL_LIB@ CURL_LIB=@CURL_LIB@
@ -140,8 +140,8 @@ OSPTK_LIB=@OSPTK_LIB@
# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image. # ossaudio can optionally use ffmpeg, x11, sdl and sdl_image.
# Because sdl_image in turn depends on sdl, we don't duplicate the include # Because sdl_image in turn depends on sdl, we don't duplicate the include
OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@ OSS_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@ OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
PGSQL_INCLUDE=@PGSQL_INCLUDE@ PGSQL_INCLUDE=@PGSQL_INCLUDE@
PGSQL_LIB=@PGSQL_LIB@ PGSQL_LIB=@PGSQL_LIB@
@ -197,8 +197,8 @@ SQLITE_LIB=@SQLITE_LIB@
SQLITE3_INCLUDE=@SQLITE3_INCLUDE@ SQLITE3_INCLUDE=@SQLITE3_INCLUDE@
SQLITE3_LIB=@SQLITE3_LIB@ SQLITE3_LIB=@SQLITE3_LIB@
SSL_INCLUDE=@OPENSSL_INCLUDE@ OPENSSL_INCLUDE=@OPENSSL_INCLUDE@
SSL_LIB=@OPENSSL_LIB@ OPENSSL_LIB=@OPENSSL_LIB@
CRYPTO_INCLUDE=@CRYPTO_INCLUDE@ CRYPTO_INCLUDE=@CRYPTO_INCLUDE@
CRYPTO_LIB=@CRYPTO_LIB@ CRYPTO_LIB=@CRYPTO_LIB@
@ -215,8 +215,8 @@ UNIXODBC_LIB=@UNIXODBC_LIB@
VORBIS_INCLUDE=@VORBIS_INCLUDE@ VORBIS_INCLUDE=@VORBIS_INCLUDE@
VORBIS_LIB=@VORBIS_LIB@ VORBIS_LIB=@VORBIS_LIB@
VPBAPI_INCLUDE=@VPB_INCLUDE@ VPB_INCLUDE=@VPB_INCLUDE@
VPBAPI_LIB=@VPB_LIB@ VPB_LIB=@VPB_LIB@
DAHDI_INCLUDE=@DAHDI_INCLUDE@ DAHDI_INCLUDE=@DAHDI_INCLUDE@

2
res/res_config_odbc.c
Unescape View File

@ -29,7 +29,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>unixodbc_or_iodbc</depend> <depend>odbc</depend>
<depend>ltdl</depend> <depend>ltdl</depend>
<depend>res_odbc</depend> <depend>res_odbc</depend>
<use>unixodbc</use> <use>unixodbc</use>

2
res/res_crypto.c
Unescape View File

@ -27,7 +27,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>ssl</depend> <depend>openssl</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"

2
res/res_odbc.c
Unescape View File

@ -30,7 +30,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>unixodbc_or_iodbc</depend> <depend>odbc</depend>
<depend>ltdl</depend> <depend>ltdl</depend>
<use>unixodbc</use> <use>unixodbc</use>
<use>iodbc</use> <use>iodbc</use>

Write Preview
Loading…
Cancel
Save