March 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4726 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Wed Mar 21 20:57:08 2007 New Revision: 4726 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Wed Mar 21 20:57:08 2007 @@ -24,7 +24,7 @@ $(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE) cd $(LIBPRI_DIR) -$(LIBSANGOMA_MAKEFILE): +$(LIBSANGOMA_MAKEFILE): $(LIBPRI_DIR) cd $(LIBSANGOMA_DIR) && CFLAGS="-I$(WANPIPE_INCLUDE)" ./configure $(OPTS) $(LIBSANGOMA_LA): $(LIBSANGOMA_MAKEFILE) @@ -37,6 +37,6 @@ cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install rm -f $(LIBSANGOMA_MAKEFILE) -local_depend: $(LIBPRI_DIR) $(WANPIPE_KO) +local_depend: $(WANPIPE_KO)

1 0

[commit] r4725 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Wed Mar 21 20:52:13 2007 New Revision: 4725 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Wed Mar 21 20:52:13 2007 @@ -3,7 +3,6 @@ LIBPRI=libpri-1.2.4 LIBPRI_FILE=$(LIBPRI).tar.gz LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) -LIBPRI_A=$(LIBPRI_DIR)/libpri.a WANPIPE=wanpipe-3.1.0.p12 WANPIPE_HOST=ftp://ftp.sangoma.com/linux/custom/3.1 WANPIPE_FILE=$(WANPIPE).tgz @@ -16,16 +15,14 @@ LOCAL_CFLAGS =-I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src LOCAL_CFLAGS +=-w -LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) $(LIBPRI_A) +LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) OPTS=--prefix=$(PREFIX) --with-libpri=../../../$(LIBPRI) --disable-shared - +LOCAL_OBJS +=$(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o include $(BASE)/build/modmake.rules $(LIBPRI_DIR): $(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE) - cd $(LIBPRI_DIR) && $(MAKE) - -$(LIBPRI_A): $(LIBPRI_DIR) + cd $(LIBPRI_DIR) $(LIBSANGOMA_MAKEFILE): cd $(LIBSANGOMA_DIR) && CFLAGS="-I$(WANPIPE_INCLUDE)" ./configure $(OPTS) @@ -40,6 +37,6 @@ cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install rm -f $(LIBSANGOMA_MAKEFILE) -local_depend: $(WANPIPE_KO) +local_depend: $(LIBPRI_DIR) $(WANPIPE_KO)

1 0

[commit] r4724 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Wed Mar 21 20:19:29 2007 New Revision: 4724 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Wed Mar 21 20:19:29 2007 @@ -9,13 +9,13 @@ WANPIPE_FILE=$(WANPIPE).tgz WANPIPE_DIR=$(BASE)/libs/$(WANPIPE) WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include +WANPIPE_KO=$(WANPIPE_DIR)/patches/kdrivers/src/net/wanpipe.ko LIBSANGOMA_DIR=$(WANPIPE_DIR)/api/libsangoma LIBSANGOMA_LA=$(LIBSANGOMA_DIR)/.libs/libsangoma.la LIBSANGOMA_MAKEFILE=$(LIBSANGOMA_DIR)/Makefile LOCAL_CFLAGS =-I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src LOCAL_CFLAGS +=-w -#LOCAL_LDFLAGS= LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) $(LIBPRI_A) OPTS=--prefix=$(PREFIX) --with-libpri=../../../$(LIBPRI) --disable-shared @@ -35,10 +35,11 @@ $(WANPIPE_DIR): $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) + +$(WANPIPE_KO): $(WANPIPE_DIR) cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install rm -f $(LIBSANGOMA_MAKEFILE) - $(TOUCH_TARGET) -local_depend: $(WANPIPE_DIR) -#MOD_CFLAGS="-I$(WANPIPE_INCLUDE)" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) libsangoma $(OPTS) +local_depend: $(WANPIPE_KO) +

1 0

[commit] r4723 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 19:58:54 2007 New Revision: 4723 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update wanpipe to be fully automated Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Wed Mar 21 19:58:54 2007 @@ -17,7 +17,7 @@ LOCAL_CFLAGS +=-w #LOCAL_LDFLAGS= LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) $(LIBPRI_A) -OPTS=--prefix=$(PREFIX) --with-libpri=$(LIBPRI_DIR) --disable-shared +OPTS=--prefix=$(PREFIX) --with-libpri=../../../$(LIBPRI) --disable-shared include $(BASE)/build/modmake.rules

1 0

[commit] r4722 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 19:44:55 2007 New Revision: 4722 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update wanpipe to be fully automated Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Wed Mar 21 19:44:55 2007 @@ -36,6 +36,7 @@ $(WANPIPE_DIR): $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install + rm -f $(LIBSANGOMA_MAKEFILE) $(TOUCH_TARGET) local_depend: $(WANPIPE_DIR)

1 0

[commit] r4721 - in freeswitch/trunk: build src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 19:42:16 2007 New Revision: 4721 Modified: freeswitch/trunk/build/getlib.sh.in freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update wanpipe to be fully automated Modified: freeswitch/trunk/build/getlib.sh.in ============================================================================== --- freeswitch/trunk/build/getlib.sh.in (original) +++ freeswitch/trunk/build/getlib.sh.in Wed Mar 21 19:42:16 2007 @@ -13,8 +13,14 @@ fi fi -base=http://svn.freeswitch.org/downloads/libs +base=http://svn.freeswitch.org/downloads/libs/ tarfile=$1 +url=`echo $tarfile | grep "://"` + +if [ ! -z $url ] ; then + base=$tarfile/ + tarfile=$2 +fi if [ ! -d $tarfile ] ; then uncompressed=`echo $tarfile | sed "s/\.tar\.gz//g"` @@ -22,7 +28,7 @@ if [ ! -f $tarfile ] ; then rm -fr $uncompressed - $DOWNLOAD_CMD $base/$tarfile + $DOWNLOAD_CMD $base$tarfile if [ ! -f $tarfile ] ; then echo cannot find $tarfile exit 1 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Wed Mar 21 19:42:16 2007 @@ -1,10 +1,43 @@ BASE=../../../.. -LOCAL_CFLAGS =-I/usr/local/include -I/usr/src/libpri -I/usr/src/linux/include -I. -I/usr/include +LIBPRI_HOST=http://ftp.digium.com/pub/libpri +LIBPRI=libpri-1.2.4 +LIBPRI_FILE=$(LIBPRI).tar.gz +LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) +LIBPRI_A=$(LIBPRI_DIR)/libpri.a +WANPIPE=wanpipe-3.1.0.p12 +WANPIPE_HOST=ftp://ftp.sangoma.com/linux/custom/3.1 +WANPIPE_FILE=$(WANPIPE).tgz +WANPIPE_DIR=$(BASE)/libs/$(WANPIPE) +WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include +LIBSANGOMA_DIR=$(WANPIPE_DIR)/api/libsangoma +LIBSANGOMA_LA=$(LIBSANGOMA_DIR)/.libs/libsangoma.la +LIBSANGOMA_MAKEFILE=$(LIBSANGOMA_DIR)/Makefile +LOCAL_CFLAGS =-I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src LOCAL_CFLAGS +=-w -LOCAL_LDFLAGS=-lsangoma $(BASE)/libs/libteletone/libteletone.la -LOCAL_OBJS=ss7boost_client.o +#LOCAL_LDFLAGS= +LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) $(LIBPRI_A) +OPTS=--prefix=$(PREFIX) --with-libpri=$(LIBPRI_DIR) --disable-shared + include $(BASE)/build/modmake.rules -local_depend: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsangoma --prefix=$(PREFIX) --with-libpri=/usr/src/libpri +$(LIBPRI_DIR): + $(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE) + cd $(LIBPRI_DIR) && $(MAKE) + +$(LIBPRI_A): $(LIBPRI_DIR) + +$(LIBSANGOMA_MAKEFILE): + cd $(LIBSANGOMA_DIR) && CFLAGS="-I$(WANPIPE_INCLUDE)" ./configure $(OPTS) + +$(LIBSANGOMA_LA): $(LIBSANGOMA_MAKEFILE) + cd $(LIBSANGOMA_DIR) && $(MAKE) + +$(WANPIPE_DIR): + $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) + cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install + $(TOUCH_TARGET) + +local_depend: $(WANPIPE_DIR) +#MOD_CFLAGS="-I$(WANPIPE_INCLUDE)" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) libsangoma $(OPTS) +

1 0

[commit] r4720 - in freeswitch/trunk/src: . mod/endpoints/mod_iax
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 17:23:40 2007 New Revision: 4720 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: cleanup Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Wed Mar 21 17:23:40 2007 @@ -587,9 +587,7 @@ default: break; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); - - + return SWITCH_STATUS_SUCCESS; } @@ -649,7 +647,8 @@ private_t *tech_pvt = NULL; switch_time_t started = switch_time_now(); unsigned int elapsed; - + switch_byte_t *data; + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -703,12 +702,14 @@ return SWITCH_STATUS_FALSE; cng: - tech_pvt->read_frame.datalen = 13; - memset(tech_pvt->read_frame.data, 0, 13); + data = (switch_byte_t *) tech_pvt->read_frame.data; + data[0] = 65; + data[1] = 0; + tech_pvt->read_frame.datalen = 2; tech_pvt->read_frame.flags = SFF_CNG; *frame = &tech_pvt->read_frame; return SWITCH_STATUS_SUCCESS; - + } static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Mar 21 17:23:40 2007 @@ -1036,10 +1036,10 @@ switch_event_fire(&event); } - /* if we're in a bridge and the other channel is in a blocking read they will never realize we have answered so send + /* if we're the child of another channel and the other channel is in a blocking read they will never realize we have answered so send a SWITCH_SIG_BREAK to interrupt any blocking reads on that channel */ - if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + if ((uuid = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); switch_core_session_rwunlock(other_session); } @@ -1075,7 +1075,7 @@ msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; msg.from = channel->name; status = switch_core_session_message_send(uuid, &msg); - + if (status == SWITCH_STATUS_SUCCESS) { status = switch_channel_perform_mark_pre_answered(channel, file, func, line); } @@ -1148,11 +1148,11 @@ switch_channel_event_set_data(channel, event); switch_event_fire(&event); } - - /* if we're in a bridge and the other channel is in a blocking read they will never realize we have answered so send + + /* if we're the child of another channel and the other channel is in a blocking read they will never realize we have answered so send a SWITCH_SIG_BREAK to interrupt any blocking reads on that channel */ - if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + if ((uuid = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); switch_core_session_rwunlock(other_session); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Mar 21 17:23:40 2007 @@ -2048,9 +2048,8 @@ switch_channel_answer(chan_a); ans_a++; } else if (!pre_b && switch_channel_test_flag(chan_b, CF_EARLY_MEDIA)) { - if (switch_channel_pre_answer(chan_a) == SWITCH_STATUS_SUCCESS) { - pre_b++; - } + switch_channel_pre_answer(chan_a); + pre_b++; } if (!pre_b) { switch_yield(10000);

1 0

[commit] r4719 - in freeswitch/trunk/libs: apr-util/build apr-util/xml/expat apr-util/xml/expat/lib apr/build
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: mikej Date: Wed Mar 21 17:14:31 2007 New Revision: 4719 Removed: freeswitch/trunk/libs/apr-util/build/apr_common.m4 freeswitch/trunk/libs/apr-util/build/find_apr.m4 freeswitch/trunk/libs/apr-util/build/get-version.sh freeswitch/trunk/libs/apr-util/build/install.sh freeswitch/trunk/libs/apr-util/xml/expat/acconfig.h freeswitch/trunk/libs/apr-util/xml/expat/config.h.in Modified: freeswitch/trunk/libs/apr-util/xml/expat/configure.in freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c freeswitch/trunk/libs/apr/build/apr_common.m4 Log: clean up the bootstrap warnings. you will need to re-run bootstrap and re-configure (or at least run the libs/apr-util/buildconf) and configure Modified: freeswitch/trunk/libs/apr-util/xml/expat/configure.in ============================================================================== --- freeswitch/trunk/libs/apr-util/xml/expat/configure.in (original) +++ freeswitch/trunk/libs/apr-util/xml/expat/configure.in Wed Mar 21 17:14:31 2007 @@ -86,9 +86,19 @@ if test "$cross_compiling" = "no"; then AC_C_BIGENDIAN else - AC_DEFINE(AP_UNKNOWN_BYTE_ORDER,1, - [byte order is unknown due to cross-compilation]) + AC_DEFINE(AP_UNKNOWN_BYTE_ORDER,1,[byte order is unknown due to cross-compilation]) fi + +if test "$ac_cv_c_bigendian" = "yes"; then + AC_DEFINE(XML_BYTE_ORDER,21,[21 for big endian or 12 for little]) +else + AC_DEFINE(XML_BYTE_ORDER,12,[z]) +fi + +AC_DEFINE(XML_NS,,[Define me]) +AC_DEFINE(XML_DTD,,[Define me]) +AC_DEFINE(XML_CONTEXT_BYTES,1024,[1024]) + AC_C_CONST AC_TYPE_OFF_T AC_TYPE_SIZE_T Modified: freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c ============================================================================== --- freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c (original) +++ freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c Wed Mar 21 17:14:31 2007 @@ -14,6 +14,13 @@ #else #include <config.h> +#ifndef HAVE_MEMMOVE +#ifdef HAVE_BCOPY +#define memmove(d,s,l) bcopy((s),(d),(l)) +#else +#define memmove(d,s,l) ;punting on memmove; +#endif + #ifdef HAVE_STRING_H # include <string.h> #endif Modified: freeswitch/trunk/libs/apr/build/apr_common.m4 ============================================================================== --- freeswitch/trunk/libs/apr/build/apr_common.m4 (original) +++ freeswitch/trunk/libs/apr/build/apr_common.m4 Wed Mar 21 17:14:31 2007 @@ -23,7 +23,7 @@ dnl dnl Saves a snapshot of the configure command-line for later reuse dnl -AC_DEFUN(APR_CONFIG_NICE,[ +AC_DEFUN([APR_CONFIG_NICE],[ rm -f $1 cat >$1<<EOF #! /bin/sh @@ -80,7 +80,7 @@ dnl APR_MKDIR_P_CHECK(fallback-mkdir-p) dnl checks whether mkdir -p works -AC_DEFUN(APR_MKDIR_P_CHECK,[ +AC_DEFUN([APR_MKDIR_P_CHECK],[ AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[ test -d conftestdir && rm -rf conftestdir mkdir -p conftestdir/somedir >/dev/null 2>&1 @@ -118,7 +118,7 @@ dnl Trying to optimize this is left as an exercise to the reader who wants dnl to put up with more autoconf craziness. I give up. dnl -AC_DEFUN(APR_SUBDIR_CONFIG, [ +AC_DEFUN([APR_SUBDIR_CONFIG], [ # save our work to this point; this allows the sub-package to use it AC_CACHE_SAVE @@ -186,7 +186,7 @@ dnl dnl Stores the variable (usually a Makefile macro) for later restoration dnl -AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[ +AC_DEFUN([APR_SAVE_THE_ENVIRONMENT],[ apr_ste_save_$1="$$1" ])dnl @@ -198,7 +198,7 @@ dnl and restoring the original variable contents. This makes it possible dnl for a user to override configure when it does something stupid. dnl -AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[ +AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT],[ if test "x$apr_ste_save_$1" = "x"; then $2$1="$$1" $1= @@ -222,7 +222,7 @@ dnl dnl Set variable iff it's currently null dnl -AC_DEFUN(APR_SETIFNULL,[ +AC_DEFUN([APR_SETIFNULL],[ if test -z "$$1"; then test "x$silent" != "xyes" && echo " setting $1 to \"$2\"" $1="$2" @@ -234,7 +234,7 @@ dnl dnl Set variable no matter what dnl -AC_DEFUN(APR_SETVAR,[ +AC_DEFUN([APR_SETVAR],[ test "x$silent" != "xyes" && echo " forcing $1 to \"$2\"" $1="$2" ])dnl @@ -244,7 +244,7 @@ dnl dnl Add value to variable dnl -AC_DEFUN(APR_ADDTO,[ +AC_DEFUN([APR_ADDTO],[ if test "x$$1" = "x"; then test "x$silent" != "xyes" && echo " setting $1 to \"$2\"" $1="$2" @@ -271,7 +271,7 @@ dnl dnl Remove a value from a variable dnl -AC_DEFUN(APR_REMOVEFROM,[ +AC_DEFUN([APR_REMOVEFROM],[ if test "x$$1" = "x$2"; then test "x$silent" != "xyes" && echo " nulling $1" $1="" @@ -295,7 +295,7 @@ dnl dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] ) dnl -AC_DEFUN(APR_CHECK_DEFINE_FILES,[ +AC_DEFUN([APR_CHECK_DEFINE_FILES],[ AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ ac_cv_define_$1=no for curhdr in $2 @@ -317,7 +317,7 @@ dnl dnl APR_CHECK_DEFINE(symbol, header_file) dnl -AC_DEFUN(APR_CHECK_DEFINE,[ +AC_DEFUN([APR_CHECK_DEFINE],[ AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ AC_EGREP_CPP(YES_IS_DEFINED, [ #include <$2> @@ -334,7 +334,7 @@ dnl dnl APR_CHECK_APR_DEFINE( symbol ) dnl -AC_DEFUN(APR_CHECK_APR_DEFINE,[ +AC_DEFUN([APR_CHECK_APR_DEFINE],[ apr_old_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $INCLUDES" AC_EGREP_CPP(YES_IS_DEFINED, [ @@ -450,7 +450,7 @@ dnl A variant of AC_CHECK_SIZEOF which allows the checking of dnl sizes of non-builtin types dnl -AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED, +AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED], [changequote(<<,>>)dnl dnl The name to #define define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl @@ -511,7 +511,7 @@ dnl string. dnl dnl -AC_DEFUN(APR_CHECK_STRERROR_R_RC,[ +AC_DEFUN([APR_CHECK_STRERROR_R_RC],[ AC_MSG_CHECKING(for type of return code from strerror_r) AC_TRY_RUN([ #include <errno.h> @@ -546,7 +546,7 @@ dnl structure on this platform. Single UNIX Spec says d_ino, dnl BSD uses d_fileno. Undef to find the real beast. dnl -AC_DEFUN(APR_CHECK_DIRENT_INODE, [ +AC_DEFUN([APR_CHECK_DIRENT_INODE], [ AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [ apr_cv_dirent_inode=no AC_TRY_COMPILE([ @@ -584,7 +584,7 @@ dnl Note that this is worthless without DT_xxx macros, so dnl look for one while we are at it. dnl -AC_DEFUN(APR_CHECK_DIRENT_TYPE,[ +AC_DEFUN([APR_CHECK_DIRENT_TYPE],[ AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[ apr_cv_dirent_type=no AC_TRY_COMPILE([ @@ -633,7 +633,7 @@ dnl all "." and "-" chars. If the 3rd parameter is "yes" then instead of dnl setting to 1 or 0, we set FLAG-TO-SET to yes or no. dnl -AC_DEFUN(APR_FLAG_HEADERS,[ +AC_DEFUN([APR_FLAG_HEADERS],[ AC_CHECK_HEADERS($1) for aprt_i in $1 do @@ -654,7 +654,7 @@ dnl is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET dnl to yes or no. dnl -AC_DEFUN(APR_FLAG_FUNCS,[ +AC_DEFUN([APR_FLAG_FUNCS],[ AC_CHECK_FUNCS($1) for aprt_j in $1 do @@ -679,7 +679,7 @@ dnl APR_EXPAND_VAR(fraz, $baz) dnl $fraz is now "1/2/3" dnl -AC_DEFUN(APR_EXPAND_VAR,[ +AC_DEFUN([APR_EXPAND_VAR],[ ap_last= ap_cur="$2" while test "x${ap_cur}" != "x${ap_last}"; @@ -698,7 +698,7 @@ dnl orig_path="${prefix}/bar" dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix) dnl $final_path now contains "bar" -AC_DEFUN(APR_PATH_RELATIVE,[ +AC_DEFUN([APR_PATH_RELATIVE],[ ap_stripped=`echo $2 | sed -e "s#^$3##"` # check if the stripping was successful if test "x$2" != "x${ap_stripped}"; then @@ -716,12 +716,12 @@ dnl Note: this define must be on one line so that it can be properly returned dnl as the help string. When using this macro with a multi-line RHS, ensure dnl that you surround the macro invocation with []s -AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) +AC_DEFUN([APR_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) dnl dnl APR_LAYOUT(configlayout, layoutname [, extravars]) dnl -AC_DEFUN(APR_LAYOUT,[ +AC_DEFUN([APR_LAYOUT],[ if test ! -f $srcdir/config.layout; then echo "** Error: Layout file $srcdir/config.layout not found" echo "** Error: Cannot use undefined layout '$LAYOUT'" @@ -784,7 +784,7 @@ dnl dnl APR_ENABLE_LAYOUT(default layout name [, extra vars]) dnl -AC_DEFUN(APR_ENABLE_LAYOUT,[ +AC_DEFUN([APR_ENABLE_LAYOUT],[ AC_ARG_ENABLE(layout, [ --enable-layout=LAYOUT],[ LAYOUT=$enableval @@ -805,7 +805,7 @@ dnl a reimplementation of autoconf's argument parser, dnl used here to allow us to co-exist layouts and argument based dnl set ups. -AC_DEFUN(APR_PARSE_ARGUMENTS,[ +AC_DEFUN([APR_PARSE_ARGUMENTS],[ ac_prev= # Retrieve the command-line arguments. The eval is needed because # the arguments are quoted to preserve accuracy. @@ -931,7 +931,7 @@ dnl dnl Determine what program we can use to generate .deps-style dependencies dnl -AC_DEFUN(APR_CHECK_DEPEND,[ +AC_DEFUN([APR_CHECK_DEPEND],[ dnl Try to determine what depend program we can use dnl All GCC-variants should have -MM. dnl If not, then we can check on those, too.

1 0

[commit] r4718 - freeswitch/trunk/src/mod/languages/mod_perl
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 16:16:33 2007 New Revision: 4718 Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile Log: fix mod_perl compile Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/Makefile Wed Mar 21 16:16:33 2007 @@ -3,18 +3,21 @@ # and define these variables to impact your build -LOCAL_CFLAGS=-DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL +PERL = `which perl` +PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE +PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}') + +LOCAL_CFLAGS=-w -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}') LOCAL_OBJS=perlxsi.o include ../../../../build/modmake.rules -PERL = $(shell which perl) -PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE -PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}') SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i + + local_all: fs_perl.$(DYNAMIC_LIB_EXTEN) .perlok:

1 0

[commit] r4717 - freeswitch/trunk/src/mod
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 15:39:31 2007 New Revision: 4717 Modified: freeswitch/trunk/src/mod/Makefile.am Log: fix exporting MODULES variable with more than 1 module in the list Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Wed Mar 21 15:39:31 2007 @@ -1,9 +1,9 @@ CONF_MODULES=if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/build/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ; FOUND_MODULES=found_modules=`find . -type d -name mod_\* | sed -e 's|^\./||'` ; -OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ; +OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules="$(MODULES)" ; fi ; OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then tmp_clean_modules=`echo $$conf_modules $$found_modules`; \ our_clean_modules=`for i in $$tmp_clean_modules ; do echo $$i ; done | sort | uniq` ; \ - else our_clean_modules=$(MODULES) ; fi ; + else our_clean_modules="$(MODULES)" ; fi ; MOD_NAME=`echo $$i | sed -e 's|^.*/||'` MOD_DIR=`if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` AM_MAKEFLAGS = `test -n "$(VERBOSE)" || echo -s`

1 0