[asterisk-commits] branch group/autoconf_and_menuselect r8806 - in
/team/group/autoconf_and_menu...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Jan 27 21:36:07 MST 2006
Author: russell
Date: Fri Jan 27 22:36:01 2006
New Revision: 8806
URL: http://svn.digium.com/view/asterisk?rev=8806&view=rev
Log:
Makefile and makeopts updates
Modified:
team/group/autoconf_and_menuselect/apps/Makefile
team/group/autoconf_and_menuselect/apps/makeopts.xml
team/group/autoconf_and_menuselect/autoconf/configure.ac
team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in
team/group/autoconf_and_menuselect/build_tools/menuselect.c
team/group/autoconf_and_menuselect/cdr/Makefile
team/group/autoconf_and_menuselect/cdr/makeopts.xml
team/group/autoconf_and_menuselect/channels/Makefile
team/group/autoconf_and_menuselect/channels/makeopts.xml
team/group/autoconf_and_menuselect/formats/Makefile
team/group/autoconf_and_menuselect/formats/makeopts.xml
team/group/autoconf_and_menuselect/pbx/Makefile
team/group/autoconf_and_menuselect/res/Makefile
team/group/autoconf_and_menuselect/res/makeopts.xml
team/group/autoconf_and_menuselect/utils/Makefile
team/group/autoconf_and_menuselect/utils/makeopts.xml
Modified: team/group/autoconf_and_menuselect/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/Makefile?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/Makefile (original)
+++ team/group/autoconf_and_menuselect/apps/Makefile Fri Jan 27 22:36:01 2006
@@ -11,51 +11,11 @@
# the GNU General Public License
#
-ifeq ($(APPS),)
-
-# The stuff in here is only used if the APPS variable was not set by one of the
-# makeopts files included in the main Makefile
-
-APPS=app_adsiprog.so app_alarmreceiver.so app_authenticate.so app_cdr.so \
- app_chanisavail.so app_chanspy.so app_controlplayback.so app_db.so \
- app_dial.so app_dictate.so app_directed_pickup.so app_directory.so \
- app_disa.so app_dumpchan.so app_echo.so app_exec.so app_externalivr.so \
- app_festival.so app_forkcdr.so app_getcpeid.so app_hasnewvoicemail.so \
- app_ices.so app_image.so app_lookupblacklist.so app_lookupcidname.so \
- app_macro.so app_milliwatt.so app_mixmonitor.so app_mp3.so app_nbscat.so \
- app_parkandannounce.so app_playback.so app_privacy.so app_queue.so \
- app_random.so app_read.so app_readfile.so app_realtime.so app_record.so \
- app_sayunixtime.so app_senddtmf.so app_sendtext.so app_setcallerid.so \
- app_setcdruserfield.so app_settransfercapability.so app_softhangup.so \
- app_stack.so app_system.so app_talkdetect.so app_test.so app_transfer.so \
- app_userevent.so app_url.so app_verbose.so app_voicemail.so \
- app_waitforring.so app_waitforsilence.so app_while.so app_zapateller.so \
- app_morsecode.so
-
#
# Obsolete things...
#
#APPS+=app_sql_postgres.so
#APPS+=app_sql_odbc.so
-
-#
-# Experimental things
-#
-#APPS+=app_ivrdemo.so
-#APPS+=app_skel.so
-#APPS+=app_rpt.so
-
-ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
- APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so
-endif
-endif # WITHOUT_ZAPTEL
-
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
-APPS+=app_osplookup.so
-endif
CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
@@ -69,7 +29,6 @@
CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so -lres_adsi.so -lres_monitor.so
else
CFLAGS+=-fPIC
-APPS+=app_sms.so
endif
#
Modified: team/group/autoconf_and_menuselect/apps/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/makeopts.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/apps/makeopts.xml Fri Jan 27 22:36:01 2006
@@ -62,6 +62,7 @@
</member>
<member>
<name>app_flash.so</name>
+ <depend>zaptel</depend>
</member>
<member>
<name>app_forkcdr.so</name>
@@ -91,7 +92,11 @@
<name>app_macro.so</name>
</member>
<member>
+ <name>app_morsecode.so</name>
+ </member>
+ <member>
<name>app_meetme.so</name>
+ <depend>zaptel</depend>
</member>
<member>
<name>app_milliwatt.so</name>
@@ -106,7 +111,12 @@
<name>app_nbscat.so</name>
</member>
<member>
+ <name>app_osplookup.so</name>
+ <depend>libosptk</depend>
+ </member>
+ <member>
<name>app_page.so</name>
+ <depend>zaptel</depend>
</member>
<member>
<name>app_parkandannounce.so</name>
@@ -161,6 +171,9 @@
<name>app_skel.so</name>
</member>
<member>
+ <name>app_sms.so</name>
+ </member>
+ <member>
<name>app_softhangup.so</name>
</member>
<member>
@@ -214,8 +227,10 @@
</member>
<member>
<name>app_zapras.so</name>
+ <depend>zaptel</depend>
</member>
<member>
<name>app_zapscan.so</name>
+ <depend>zaptel</depend>
</member>
</category>
Modified: team/group/autoconf_and_menuselect/autoconf/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/configure.ac?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/configure.ac (original)
+++ team/group/autoconf_and_menuselect/autoconf/configure.ac Fri Jan 27 22:36:01 2006
@@ -166,6 +166,14 @@
xLInclude=$CROSS_COMPILE_ROOT/usr/local/include
#######################
+# OGG/Vorbis
+
+PBX_OGGVORBIS=1
+# check header & lib
+AC_CHECK_HEADERS([${xInclude}/vorbis/codec.h], [], [PBX_OGGVORBIS=0])
+AC_SUBST(PBX_OGGVORBIS)
+
+#######################
# zaptel module
PBX_ZAPTEL=1
@@ -363,14 +371,13 @@
AC_CHECK_LIB([crypto], [CRYPTO_malloc], [], [AC_MSG_ERROR("you need crypto library to compile asterisk")])
#AC_CHECK_LIB([db], [dbopen], [], [AC_MSG_ERROR("you need db library to compile asterisk")])
AC_CHECK_LIB([dl], [dlopen], [], [AC_MSG_ERROR("you need dl library to compile asterisk")])
-AC_CHECK_LIB([expat], [XML_SetBase], [], [AC_MSG_ERROR("you need expat library to compile asterisk")])
+#AC_CHECK_LIB([expat], [XML_SetBase], [], [AC_MSG_ERROR("you need expat library to compile asterisk")])
AC_CHECK_LIB([m], [powl], [], [AC_MSG_ERROR("you need m library to compile asterisk")])
AC_CHECK_LIB([ncurses], [wclear], [], [AC_MSG_ERROR("you need ncurses library to compile asterisk")])
-AC_CHECK_LIB([nsl], [nis_perror], [], [AC_MSG_ERROR("you need nsl library to compile asterisk")])
-AC_CHECK_LIB([ogg], [oggpack_read], [], [AC_MSG_ERROR("you need ogg library to compile asterisk")])
+#AC_CHECK_LIB([nsl], [nis_perror], [], [AC_MSG_ERROR("you need nsl library to compile asterisk")])
AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR("you need pthread library to compile asterisk")])
AC_CHECK_LIB([resolv], [inet_neta], [], [AC_MSG_ERROR("you need resolv library to compile asterisk")])
-AC_CHECK_LIB([rt], [mq_send], [], [AC_MSG_ERROR("you need rt library to compile asterisk")])
+#AC_CHECK_LIB([rt], [mq_send], [], [AC_MSG_ERROR("you need rt library to compile asterisk")])
AC_CHECK_LIB([socket], [socket])
AC_CHECK_LIB([ssl], [ssl2_connect])
AC_CHECK_LIB([z], [compress])
Modified: team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in Fri Jan 27 22:36:01 2006
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
+<oggvorbis>@PBX_OGGVORBIS@</oggvorbis>
<zaptel>@PBX_ZAPTEL@</zaptel>
<unixodbc>@PBX_UNIXODBC@</unixodbc>
<pgsql>@PBX_PGSQL@</pgsql>
Modified: team/group/autoconf_and_menuselect/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/menuselect.c?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/menuselect.c (original)
+++ team/group/autoconf_and_menuselect/build_tools/menuselect.c Fri Jan 27 22:36:01 2006
@@ -225,12 +225,6 @@
* the member list for the category.
*/
- /* TODO There is no need to require the 'category' tag. The outer tag can simply
- be replaced with the name, and the name can be removed from inside. For example:
- <APPS>
- ...
- </APPS>
- */
for (cur = mxmlFindElement(tree->root, tree->root, "category", NULL, NULL, MXML_DESCEND);
cur;
cur = mxmlFindElement(cur, tree->root, "category", NULL, NULL, MXML_DESCEND))
Modified: team/group/autoconf_and_menuselect/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/cdr/Makefile?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/cdr/Makefile (original)
+++ team/group/autoconf_and_menuselect/cdr/Makefile Fri Jan 27 22:36:01 2006
@@ -11,20 +11,11 @@
# the GNU General Public License
#
-ifeq ($(CDR_MODULES),)
-CDR_MODULES=cdr_csv.so cdr_manager.so cdr_custom.so
-endif
-
ifeq (${OSARCH},CYGWIN)
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
CYGSOLIB=-L.. -L. -lasterisk.dll
else
CFLAGS+=-fPIC
-endif
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
@@ -35,13 +26,6 @@
ifeq ($(PROC),sparc64)
PROC=ultrasparc
CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
-endif
-
-#
-# unixODBC stuff...
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
- CDR_MODULES+=cdr_odbc.so
endif
#
@@ -57,16 +41,11 @@
CFLAGS += -DFREETDS_PRE_0_62
endif
endif
- CDR_MODULES+=cdr_tds.so
endif
#
# PGSQL stuff... Autoconf anyone??
#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
- CDR_MODULES+=cdr_pgsql.so
-endif
-
MLFLAGS=
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql),)
@@ -102,13 +81,6 @@
MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib
endif
-#
-# SQLite stuff...
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite.h),)
- CDR_MODULES+=cdr_sqlite.so
-endif
-
all: depend $(CDR_MODULES)
install: all
Modified: team/group/autoconf_and_menuselect/cdr/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/cdr/makeopts.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/cdr/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/cdr/makeopts.xml Fri Jan 27 22:36:01 2006
@@ -7,9 +7,25 @@
<name>cdr_csv.so</name>
</member>
<member>
+ <name>cdr_custom.so</name>
+ </member>
+ <member>
<name>cdr_manager.so</name>
</member>
<member>
- <name>cdr_custom.so</name>
+ <name>cdr_odbc.so</name>
+ <depend>unixodbc</depend>
+ </member>
+ <member>
+ <name>cdr_pgsql.so</name>
+ <depend>pgsql</depend>
+ </member>
+ <member>
+ <name>cdr_sqlite.so</name>
+ <depend>sqlite</depend>
+ </member>
+ <member>
+ <name>cdr_tds.so</name>
+ <depend>freetds</depend>
</member>
</category>
Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Fri Jan 27 22:36:01 2006
@@ -13,10 +13,6 @@
# This program is free software, distributed under the terms of
# the GNU General Public License
#
-
-ifeq ($(CHANNEL_LIBS),)
-CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
-endif
ifeq (${OSARCH},OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r
@@ -65,10 +61,6 @@
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
CHANNEL_LIBS+=chan_phone.so
-endif
-
-ifneq ($(wildcard h323/libchanh323.a),)
- CHANNEL_LIBS+=chan_h323.so
endif
ifneq ($(wildcard misdn/chan_misdn_lib.a),)
@@ -110,14 +102,8 @@
SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
CFLAGS+=-DIAX_TRUNKING
- CHANNEL_LIBS+=chan_zap.so
endif
endif # WITHOUT_ZAPTEL
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
- CHANNEL_LIBS+=chan_vpb.so
- CFLAGS+=-DLINUX
-endif
CFLAGS+=-DCRYPTO
@@ -128,10 +114,6 @@
CFLAGS+=#-DVOFRDUMPER
ZAPDIR=/usr/lib
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
- CHANNEL_LIBS+=chan_nbs.so
-endif
ifndef OPENH323DIR
OPENH323DIR=$(HOME)/openh323
Modified: team/group/autoconf_and_menuselect/channels/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/makeopts.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/channels/makeopts.xml Fri Jan 27 22:36:01 2006
@@ -4,16 +4,16 @@
<name>CHANNEL_LIBS</name>
<displayname>Channel Drivers</displayname>
<member>
- <name>chan_sip.so</name>
- <description>SIP Channel Driver</description>
- </member>
- <member>
<name>chan_agent.so</name>
<description>Agent Proxy Channel Driver</description>
</member>
<member>
- <name>chan_mgcp.so</name>
- <description>MGCP Channel Driver</description>
+ <name>chan_features.so</name>
+ <description>Features Proxy Channel (experimental)</description>
+ </member>
+ <member>
+ <name>chan_h323.so</name>
+ <depend>h323</depend>
</member>
<member>
<name>chan_iax2.so</name>
@@ -24,11 +24,27 @@
<description>Local Proxy Channel Driver</description>
</member>
<member>
+ <name>chan_mgcp.so</name>
+ <description>MGCP Channel Driver</description>
+ </member>
+ <member>
+ <name>chan_nbs.so</name>
+ <depend>nbs</depend>
+ </member>
+ <member>
+ <name>chan_sip.so</name>
+ <description>SIP Channel Driver</description>
+ </member>
+ <member>
<name>chan_skinny.so</name>
<description>skinny Channel Driver</description>
</member>
<member>
- <name>chan_features.so</name>
- <description>Features Proxy Channel (experimental)</description>
+ <name>chan_vpb.so</name>
+ <depend>vpbapi</depend>
+ </member>
+ <member>
+ <name>chan_zap.so</name>
+ <depend>zaptel</depend>
</member>
</category>
Modified: team/group/autoconf_and_menuselect/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/Makefile?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/Makefile (original)
+++ team/group/autoconf_and_menuselect/formats/Makefile Fri Jan 27 22:36:01 2006
@@ -10,25 +10,6 @@
# This program is free software, distributed under the terms of
# the GNU General Public License
#
-
-ifeq ($(FORMAT_LIBS),)
-FORMAT_LIBS=format_gsm.so format_wav.so format_jpeg.so \
- format_wav_gsm.so format_vox.so format_pcm.so format_g729.so \
- format_pcm_alaw.so format_h263.so format_g726.so format_ilbc.so \
- format_sln.so format_au.so format_h264.so
-endif
-
-#
-# G723 simple frame is deprecated
-#
-FORMAT_LIBS+=format_g723.so
-
-#
-# OGG/Vorbis format
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
- FORMAT_LIBS+=format_ogg_vorbis.so
-endif
GSMLIB=../codecs/gsm/lib/libgsm.a
Modified: team/group/autoconf_and_menuselect/formats/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/makeopts.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/formats/makeopts.xml Fri Jan 27 22:36:01 2006
@@ -4,42 +4,57 @@
<name>FORMAT_LIBS</name>
<displayname>Formats</displayname>
<member>
+ <name>format_au.so</name>
+ </member>
+ <member>
+ <name>format_g723.so</name>
+ </member>
+ <member>
+ <name>format_g726.so</name>
+ </member>
+
+ <member>
+ <name>format_g729.so</name>
+ </member>
+
+ <member>
<name>format_gsm.so</name>
+ </member>
+
+ <member>
+ <name>format_h263.so</name>
+ </member>
+
+ <member>
+ <name>format_h264.so</name>
+ </member>
+ <member>
+ <name>format_ilbc.so</name>
+ </member>
+ <member>
+ <name>format_jpeg.so</name>
+ </member>
+
+ <member>
+ <name>format_ogg_vorbis.so</name>
+ <depend>oggvorbis</depend>
+ </member>
+ <member>
+ <name>format_pcm.so</name>
+ </member>
+ <member>
+ <name>format_pcm_alaw.so</name>
+ </member>
+ <member>
+ <name>format_sln.so</name>
+ </member>
+ <member>
+ <name>format_vox.so</name>
</member>
<member>
<name>format_wav.so</name>
</member>
<member>
- <name>format_jpeg.so</name>
- </member>
- <member>
<name>format_wav_gsm.so</name>
</member>
- <member>
- <name>format_vox.so</name>
- </member>
- <member>
- <name>format_pcm.so</name>
- </member>
- <member>
- <name>format_g729.so</name>
- </member>
- <member>
- <name>format_pcm_alaw.so</name>
- </member>
- <member>
- <name>format_h263.so</name>
- </member>
- <member>
- <name>format_g726.so</name>
- </member>
- <member>
- <name>format_ilbc.so</name>
- </member>
- <member>
- <name>format_sln.so</name>
- </member>
- <member>
- <name>format_au.so</name>
- </member>
</category>
Modified: team/group/autoconf_and_menuselect/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/Makefile?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/Makefile (original)
+++ team/group/autoconf_and_menuselect/pbx/Makefile Fri Jan 27 22:36:01 2006
@@ -10,11 +10,6 @@
# This program is free software, distributed under the terms of
# the GNU General Public License
#
-
-ifeq ($(PBX_LIBS),)
-PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so pbx_realtime.so \
- pbx_ael.so
-endif
# Add GTK console if appropriate
#PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
Modified: team/group/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/Makefile?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/Makefile (original)
+++ team/group/autoconf_and_menuselect/res/Makefile Fri Jan 27 22:36:01 2006
@@ -11,40 +11,11 @@
# the GNU General Public License
#
-ifeq ($(RES_MODULES),)
-RES_MODULES=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so res_clioriginate.so
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
- ifneq (${OSARCH},FreeBSD)
- RES_MODULES+=res_config_odbc.so
- else
- RES_MODULES+=$(shell if test ${BSDVERSION} -ge 500000 ; then echo "res_config_odbc.so"; fi)
- endif
- RES_MODULES+=res_odbc.so
-endif
-
-ifneq ($(NOCRYPTO),yes)
- RES_MODULES+=res_crypto.so
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a),)
- RES_MODULES+=res_osp.so
- OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a
-else
- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a),)
- RES_MODULES+=res_osp.so
- OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a
- endif
-endif
-
ifeq (${OSARCH},CYGWIN)
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
CYGSOLIB=-L.. -L. -lasterisk.dll
CYG_RES_CONFIG_ODBC_LIB=-lres_odbc.so
CYG_RES_FEATURES_LIB=-lres_adsi.so -lres_monitor.so
-else
-RES_MODULES+=res_musiconhold.so
endif
CRYPTO_LIBS=-lssl -lcrypto
Modified: team/group/autoconf_and_menuselect/res/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/makeopts.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/res/makeopts.xml Fri Jan 27 22:36:01 2006
@@ -3,6 +3,25 @@
<category>
<name>RES_MODULES</name>
<displayname>Resources</displayname>
+ <member>
+ <name>res_adsi.so</name>
+ <description>ADSI Support</description>
+ </member>
+ <member>
+ <name>res_agi.so</name>
+ <description>AGI</description>
+ </member>
+ <member>
+ <name>res_config_odbc.so</name>
+ <depend>unixodbc</depend>
+ </member>
+ <member>
+ <name>res_crypto.so</name>
+ </member>
+ <member>
+ <name>res_features.so</name>
+ <description>Call Features</description>
+ </member>
<member>
<name>res_indications.so</name>
<description>Indications</description>
@@ -12,15 +31,14 @@
<description>Monitor</description>
</member>
<member>
- <name>res_adsi.so</name>
- <description>ADSI Support</description>
+ <name>res_musiconhold.so</name>
</member>
<member>
- <name>res_agi.so</name>
- <description>AGI</description>
+ <name>res_odbc.so</name>
+ <depend>unixodbc</depend>
</member>
<member>
- <name>res_features.so</name>
- <description>Call Features</description>
+ <name>res_osp.so</name>
+ <depend>libosptk</depend>
</member>
</category>
Modified: team/group/autoconf_and_menuselect/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/utils/Makefile?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/utils/Makefile (original)
+++ team/group/autoconf_and_menuselect/utils/Makefile Fri Jan 27 22:36:01 2006
@@ -15,20 +15,6 @@
# Don't use ast mm routines
#
CFLAGS+=-DNO_AST_MM
-
-ifeq ($(UTILS),)
-
-UTILS=stereorize streamplayer
-
-ifneq ($(wildcard $(CROSS_COMPILE_UTILS)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_UTILS)/usr/local/include/popt.h),)
- UTILS+=smsq
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_UTILS)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_UTILS)/usr/local/include/newt.h),)
- UTILS+=astman
-endif
-
-endif
ifeq (${OSARCH},SunOS)
SOL=../strcompat.o
Modified: team/group/autoconf_and_menuselect/utils/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/utils/makeopts.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/utils/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/utils/makeopts.xml Fri Jan 27 22:36:01 2006
@@ -3,6 +3,14 @@
<category>
<name>UTILS</name>
<displayname>Utilities</displayname>
+ <member>
+ <name>astman</name>
+ <depend>libnewt</depend>
+ </member>
+ <member>
+ <name>smsq</name>
+ <depend>libpopt</depend>
+ </member>
<member>
<name>streamplayer</name>
<description>A utility for reading from a raw TCP stream and sending the data to stdout</description>
More information about the asterisk-commits
mailing list