[asterisk-commits] kpfleming: trunk r154151 - in /trunk: ./ apps/ build_tools/ cdr/ channels/ fu...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Nov 4 09:07:55 CST 2008
Author: kpfleming
Date: Tue Nov 4 09:07:54 2008
New Revision: 154151
URL: http://svn.digium.com/view/asterisk?view=rev&rev=154151
Log:
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
Modified:
trunk/apps/app_osplookup.c
trunk/apps/app_voicemail.c
trunk/build_tools/menuselect-deps.in
trunk/cdr/cdr_adaptive_odbc.c
trunk/cdr/cdr_odbc.c
trunk/channels/chan_alsa.c
trunk/channels/chan_oss.c
trunk/channels/chan_usbradio.c
trunk/channels/chan_vpb.cc
trunk/configure
trunk/configure.ac
trunk/funcs/func_odbc.c
trunk/makeopts.in
trunk/res/res_config_odbc.c
trunk/res/res_crypto.c
trunk/res/res_odbc.c
Modified: trunk/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_osplookup.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/apps/app_osplookup.c (original)
+++ trunk/apps/app_osplookup.c Tue Nov 4 09:07:54 2008
@@ -30,7 +30,7 @@
/*** MODULEINFO
<depend>osptk</depend>
- <depend>ssl</depend>
+ <depend>openssl</depend>
***/
#include "asterisk.h"
Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Nov 4 09:07:54 2008
@@ -47,7 +47,7 @@
/*** 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">
<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
- <depend>unixodbc_or_iodbc</depend>
+ <depend>odbc</depend>
<depend>ltdl</depend>
<use>unixodbc</use>
<use>iodbc</use>
@@ -57,7 +57,7 @@
<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
<depend>imap_tk</depend>
<conflict>ODBC_STORAGE</conflict>
- <use>ssl</use>
+ <use>openssl</use>
<defaultenabled>no</defaultenabled>
</member>
</category>
Modified: trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect-deps.in?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Tue Nov 4 09:07:54 2008
@@ -1,4 +1,4 @@
-ASOUND=@PBX_ALSA@
+ALSA=@PBX_ALSA@
CRYPTO=@PBX_CRYPTO@
CURL=@PBX_CURL@
DAHDI=@PBX_DAHDI@
@@ -24,11 +24,11 @@
NBS=@PBX_NBS@
NETSNMP=@PBX_NETSNMP@
NEWT=@PBX_NEWT@
-UNIXODBC_OR_IODBC=@PBX_ODBC@
+ODBC=@PBX_ODBC@
OGG=@PBX_OGG@
OPENH323=@PBX_OPENH323@
OSPTK=@PBX_OSPTK@
-OSSAUDIO=@PBX_OSS@
+OSS=@PBX_OSS@
PGSQL=@PBX_PGSQL@
POPT=@PBX_POPT@
PORTAUDIO=@PBX_PORTAUDIO@
@@ -43,12 +43,12 @@
SQLITE3=@PBX_SQLITE3@
SQLITE=@PBX_SQLITE@
SS7=@PBX_SS7@
-SSL=@PBX_OPENSSL@
+OPENSSL=@PBX_OPENSSL@
SUPPSERV=@PBX_SUPPSERV@
TONEZONE=@PBX_TONEZONE@
UNIXODBC=@PBX_UNIXODBC@
USB=@PBX_USB@
VORBIS=@PBX_VORBIS@
-VPBAPI=@PBX_VPB@
-WINARCH=@WINARCH@
+VPB=@PBX_VPB@
+WINARCH=@PBX_WINARCH@
ZLIB=@PBX_ZLIB@
Modified: trunk/cdr/cdr_adaptive_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_adaptive_odbc.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/cdr/cdr_adaptive_odbc.c (original)
+++ trunk/cdr/cdr_adaptive_odbc.c Tue Nov 4 09:07:54 2008
@@ -25,7 +25,7 @@
*/
/*** MODULEINFO
- <depend>unixodbc_or_iodbc</depend>
+ <depend>odbc</depend>
<use>unixodbc</use>
<use>iodbc</use>
***/
Modified: trunk/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_odbc.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/cdr/cdr_odbc.c (original)
+++ trunk/cdr/cdr_odbc.c Tue Nov 4 09:07:54 2008
@@ -29,7 +29,7 @@
*/
/*** MODULEINFO
- <depend>unixodbc_or_iodbc</depend>
+ <depend>odbc</depend>
<depend>ltdl</depend>
<use>unixodbc</use>
<use>iodbc</use>
Modified: trunk/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_alsa.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/channels/chan_alsa.c (original)
+++ trunk/channels/chan_alsa.c Tue Nov 4 09:07:54 2008
@@ -28,7 +28,7 @@
*/
/*** MODULEINFO
- <depend>asound</depend>
+ <depend>alsa</depend>
***/
#include "asterisk.h"
Modified: trunk/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_oss.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/channels/chan_oss.c (original)
+++ trunk/channels/chan_oss.c Tue Nov 4 09:07:54 2008
@@ -34,7 +34,7 @@
*/
/*** MODULEINFO
- <depend>ossaudio</depend>
+ <depend>oss</depend>
***/
#include "asterisk.h"
Modified: trunk/channels/chan_usbradio.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_usbradio.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/channels/chan_usbradio.c (original)
+++ trunk/channels/chan_usbradio.c Tue Nov 4 09:07:54 2008
@@ -34,7 +34,7 @@
*/
/*** MODULEINFO
- <depend>ossaudio</depend>
+ <depend>oss</depend>
<depend>usb</depend>
<defaultenabled>no</defaultenabled>
***/
Modified: trunk/channels/chan_vpb.cc
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_vpb.cc?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/channels/chan_vpb.cc (original)
+++ trunk/channels/chan_vpb.cc Tue Nov 4 09:07:54 2008
@@ -30,7 +30,7 @@
*/
/*** MODULEINFO
- <depend>vpbapi</depend>
+ <depend>vpb</depend>
***/
#include <vpbapi.h>
Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Nov 4 09:07:54 2008
@@ -82,7 +82,7 @@
AC_SUBST(HOST_VENDOR)
AC_SUBST(HOST_OS)
-WINARCH=0
+PBX_WINARCH=0
case "${host_os}" in
freebsd*)
@@ -99,11 +99,11 @@
;;
mingw32)
OSARCH=mingw32
- WINARCH=1
+ PBX_WINARCH=1
;;
cygwin)
OSARCH=cygwin
- WINARCH=1
+ PBX_WINARCH=1
;;
*)
OSARCH=${host_os}
@@ -111,7 +111,7 @@
esac
AC_SUBST(OSARCH)
-AC_SUBST(WINARCH)
+AC_SUBST(PBX_WINARCH)
# check for uname
AC_PATH_TOOL([UNAME], [uname], No)
@@ -1649,6 +1649,16 @@
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
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
if test "x${silent}" != "xyes" ; then
Modified: trunk/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_odbc.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/funcs/func_odbc.c (original)
+++ trunk/funcs/func_odbc.c Tue Nov 4 09:07:54 2008
@@ -27,7 +27,7 @@
*/
/*** MODULEINFO
- <depend>unixodbc_or_iodbc</depend>
+ <depend>odbc</depend>
<depend>ltdl</depend>
<depend>res_odbc</depend>
<use>unixodbc</use>
Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Tue Nov 4 09:07:54 2008
@@ -68,8 +68,8 @@
AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@
-ASOUND_INCLUDE=@ALSA_INCLUDE@
-ASOUND_LIB=@ALSA_LIB@
+ALSA_INCLUDE=@ALSA_INCLUDE@
+ALSA_LIB=@ALSA_LIB@
CURL_INCLUDE=@CURL_INCLUDE@
CURL_LIB=@CURL_LIB@
@@ -140,8 +140,8 @@
# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image.
# Because sdl_image in turn depends on sdl, we don't duplicate the include
-OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
-OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
+OSS_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
+OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
PGSQL_INCLUDE=@PGSQL_INCLUDE@
PGSQL_LIB=@PGSQL_LIB@
@@ -197,8 +197,8 @@
SQLITE3_INCLUDE=@SQLITE3_INCLUDE@
SQLITE3_LIB=@SQLITE3_LIB@
-SSL_INCLUDE=@OPENSSL_INCLUDE@
-SSL_LIB=@OPENSSL_LIB@
+OPENSSL_INCLUDE=@OPENSSL_INCLUDE@
+OPENSSL_LIB=@OPENSSL_LIB@
CRYPTO_INCLUDE=@CRYPTO_INCLUDE@
CRYPTO_LIB=@CRYPTO_LIB@
@@ -215,8 +215,8 @@
VORBIS_INCLUDE=@VORBIS_INCLUDE@
VORBIS_LIB=@VORBIS_LIB@
-VPBAPI_INCLUDE=@VPB_INCLUDE@
-VPBAPI_LIB=@VPB_LIB@
+VPB_INCLUDE=@VPB_INCLUDE@
+VPB_LIB=@VPB_LIB@
DAHDI_INCLUDE=@DAHDI_INCLUDE@
Modified: trunk/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_odbc.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Tue Nov 4 09:07:54 2008
@@ -29,7 +29,7 @@
*/
/*** MODULEINFO
- <depend>unixodbc_or_iodbc</depend>
+ <depend>odbc</depend>
<depend>ltdl</depend>
<depend>res_odbc</depend>
<use>unixodbc</use>
Modified: trunk/res/res_crypto.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_crypto.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/res/res_crypto.c (original)
+++ trunk/res/res_crypto.c Tue Nov 4 09:07:54 2008
@@ -27,7 +27,7 @@
*/
/*** MODULEINFO
- <depend>ssl</depend>
+ <depend>openssl</depend>
***/
#include "asterisk.h"
Modified: trunk/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_odbc.c?view=diff&rev=154151&r1=154150&r2=154151
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Tue Nov 4 09:07:54 2008
@@ -30,7 +30,7 @@
*/
/*** MODULEINFO
- <depend>unixodbc_or_iodbc</depend>
+ <depend>odbc</depend>
<depend>ltdl</depend>
<use>unixodbc</use>
<use>iodbc</use>
More information about the asterisk-commits
mailing list