September 2006 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r2805 - freeswitch/branches/voctel/src/mod/applications/mod_phonecard
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: voctel Date: Sat Sep 23 02:30:43 2006 New Revision: 2805 Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c Log: compile fixes Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c Sat Sep 23 02:30:43 2006 @@ -45,7 +45,7 @@ static char *db_password = NULL; static char *db_language = NULL; static char *db_table = NULL; -static int db_port = 0; +static char *db_port = NULL; static int db_connected = 0; @@ -96,6 +96,8 @@ //-- main application routine static void phonecard_main(switch_core_session_t *session, char *data) { + char *mydata = switch_core_session_strdup(session, data); + //-- if (!mydata) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");

1 0

[Freeswitch-svn] [commit] r2804 - freeswitch/branches/voctel/src/mod/applications/mod_phonecard
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: voctel Date: Sat Sep 23 02:27:09 2006 New Revision: 2804 Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c Log: more compile fixes Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c Sat Sep 23 02:27:09 2006 @@ -54,11 +54,6 @@ switch_mutex_t *db_lock; -//-- Function Prototypes -static int phonecard_dbconnected(void); -static void phonecard_main(switch_core_session_t *session, char *data) - - //-- function used to connect/verify database connection static int phonecard_dbconnected(void) { PGresult *result;

1 0

[Freeswitch-svn] [commit] r2803 - freeswitch/branches/voctel/src/mod/applications/mod_phonecard
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: voctel Date: Sat Sep 23 02:23:39 2006 New Revision: 2803 Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c Log: more compile fixes Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c Sat Sep 23 02:23:39 2006 @@ -31,7 +31,6 @@ * */ #include <switch.h> -#include <mod_phonecard.h> //-- PostgreSQL #include <libpq-fe.h> @@ -55,19 +54,24 @@ switch_mutex_t *db_lock; +//-- Function Prototypes +static int phonecard_dbconnected(void); +static void phonecard_main(switch_core_session_t *session, char *data) + + //-- function used to connect/verify database connection -int db_connected(void) { +static int phonecard_dbconnected(void) { PGresult *result; //-- check to see if we are already connected - if (dbconnected) { + if (db_connected) { result = PQexec(DBConn,"SELECT 1"); PQclear(result); //-- check for connectivity if (PQstatus(DBConn)!= CONNECTION_OK) { - dbconnected = 0; + db_connected = 0; PQreset(DBConn); @@ -80,7 +84,7 @@ } else { //-- we are not connected - so make the initial connection - DBConn = PQsetdbLogin(dbhost, dbport, NULL, NULL, dbname, dbuser, dbpass); + DBConn = PQsetdbLogin(db_hostname, db_port, NULL, NULL, db_name, db_username, db_password); if (PQstatus(DBConn) != CONNECTION_OK) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "FATAL - Couldn't connect to database server '%s'. \n", db_hostname); db_connected = 0;

1 0

[Freeswitch-svn] [commit] r2802 - freeswitch/branches/voctel/src/mod/applications/mod_phonecard
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: voctel Date: Sat Sep 23 02:18:20 2006 New Revision: 2802 Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/Makefile Log: oops Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/Makefile ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_phonecard/Makefile (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/Makefile Sat Sep 23 02:18:20 2006 @@ -1,6 +1,5 @@ LDFLAGS += -L/usr/local/pgsql/lib -lpq CFLAGS += -I/usr/local/pgsql/include -endif LINKER=$(CC)

1 0

[Freeswitch-svn] [commit] r2801 - freeswitch/branches/voctel/src/mod/applications/mod_phonecard
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: voctel Date: Sat Sep 23 02:16:46 2006 New Revision: 2801 Added: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/Makefile Log: doing some compile fixes Added: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/Makefile Sat Sep 23 02:16:46 2006 @@ -0,0 +1,19 @@ +LDFLAGS += -L/usr/local/pgsql/lib -lpq +CFLAGS += -I/usr/local/pgsql/include +endif + +LINKER=$(CC) + +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c + $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o + $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod

1 0

[Freeswitch-svn] [commit] r2800 - freeswitch/branches/voctel/src/mod/applications/mod_phonecard
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: voctel Date: Sat Sep 23 02:15:56 2006 New Revision: 2800 Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.h Log: doing some compile fixes Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c Sat Sep 23 02:15:56 2006 @@ -36,7 +36,7 @@ //-- PostgreSQL #include <libpq-fe.h> -static const char modname[] = "mod_voctel"; +static const char modname[] = "mod_phonecard"; static const char global_app_name[] = "phonecard"; static char *global_cf_name = "phonecard.conf"; @@ -50,14 +50,60 @@ static int db_connected = 0; -/* PostgreSQL declarations */ +//-- PostgreSQL declarations PGconn *DBConn; switch_mutex_t *db_lock; +//-- function used to connect/verify database connection +int db_connected(void) { + PGresult *result; + + //-- check to see if we are already connected + if (dbconnected) { + result = PQexec(DBConn,"SELECT 1"); + + PQclear(result); + + //-- check for connectivity + if (PQstatus(DBConn)!= CONNECTION_OK) { + dbconnected = 0; + + PQreset(DBConn); + + //-- log the database error + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "FATAL - Database connection lost '%s'\n", db_hostname); + } + else { + db_connected = 1; + } + } + else { + //-- we are not connected - so make the initial connection + DBConn = PQsetdbLogin(dbhost, dbport, NULL, NULL, dbname, dbuser, dbpass); + if (PQstatus(DBConn) != CONNECTION_OK) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "FATAL - Couldn't connect to database server '%s'. \n", db_hostname); + db_connected = 0; + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Successfully connected to database '%s:%s'.\n", db_hostname, db_name); + db_connected = 1; + } + } + + return db_connected; +} + //-- main application routine static void phonecard_main(switch_core_session_t *session, char *data) { + //-- + if (!mydata) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); } Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.h ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.h (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.h Sat Sep 23 02:15:56 2006 @@ -30,11 +30,9 @@ * mod_phonecard.h -- Calling Card Module * */ -/*! \brief Function used to connect to MS SQL */ -extern int mssql_connect(void); -/*! \brief Function used to connect to MS SQL */ -extern int mssql_disconnect(void); +/*! \brief Function used to connect to PostgreSQL */ +extern int db_connected(void);

1 0

[Freeswitch-svn] [commit] r2799 - in freeswitch/branches/tholo: . libs/codec/gsm libs/codec/ilbc libs/iax libs/libdingaling libs/libteletone mac/xcode/FreeSWITCH.xcodeproj
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: tholo Date: Sat Sep 23 01:40:44 2006 New Revision: 2799 Modified: freeswitch/branches/tholo/ (props changed) freeswitch/branches/tholo/libs/codec/gsm/ (props changed) freeswitch/branches/tholo/libs/codec/ilbc/ (props changed) freeswitch/branches/tholo/libs/iax/ (props changed) freeswitch/branches/tholo/libs/libdingaling/ (props changed) freeswitch/branches/tholo/libs/libteletone/ (props changed) freeswitch/branches/tholo/mac/xcode/FreeSWITCH.xcodeproj/ (props changed) Log: Ignore some more generated files

1 0

[Freeswitch-svn] [commit] r2798 - in freeswitch/branches/tholo/src/mod: applications/mod_bridgecall applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_echo applications/mod_ivrtest applications/mod_playback applications/mod_skel codecs/mod_g711 codecs/mod_gsm codecs/mod_ilbc codecs/mod_l16 dialplans/mod_dialplan_xml endpoints/mod_dingaling endpoints/mod_exosip endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_woomera event_handlers/mod_xmpp_event formats/mo
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: tholo Date: Sat Sep 23 01:34:52 2006 New Revision: 2798 Modified: freeswitch/branches/tholo/src/mod/applications/mod_bridgecall/ (props changed) freeswitch/branches/tholo/src/mod/applications/mod_commands/ (props changed) freeswitch/branches/tholo/src/mod/applications/mod_conference/ (props changed) freeswitch/branches/tholo/src/mod/applications/mod_dptools/ (props changed) freeswitch/branches/tholo/src/mod/applications/mod_echo/ (props changed) freeswitch/branches/tholo/src/mod/applications/mod_ivrtest/ (props changed) freeswitch/branches/tholo/src/mod/applications/mod_playback/ (props changed) freeswitch/branches/tholo/src/mod/applications/mod_skel/ (props changed) freeswitch/branches/tholo/src/mod/codecs/mod_g711/ (props changed) freeswitch/branches/tholo/src/mod/codecs/mod_gsm/ (props changed) freeswitch/branches/tholo/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/branches/tholo/src/mod/codecs/mod_l16/ (props changed) freeswitch/branches/tholo/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/branches/tholo/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/branches/tholo/src/mod/endpoints/mod_exosip/ (props changed) freeswitch/branches/tholo/src/mod/endpoints/mod_iax/ (props changed) freeswitch/branches/tholo/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/branches/tholo/src/mod/endpoints/mod_woomera/ (props changed) freeswitch/branches/tholo/src/mod/event_handlers/mod_xmpp_event/ (props changed) freeswitch/branches/tholo/src/mod/formats/mod_sndfile/ (props changed) freeswitch/branches/tholo/src/mod/loggers/mod_console/ (props changed) freeswitch/branches/tholo/src/mod/loggers/mod_syslog/ (props changed) freeswitch/branches/tholo/src/mod/timers/mod_softtimer/ (props changed) Log: Ignore *.dylib, common on Mac OS X

1 0

[Freeswitch-svn] [commit] r2797 - in freeswitch/branches/voctel/src/mod/applications: mod_conference mod_phonecard
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: voctel Date: Sat Sep 23 01:32:10 2006 New Revision: 2797 Modified: freeswitch/branches/voctel/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.h Log: switch inital db type to postgresql Modified: freeswitch/branches/voctel/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_conference/mod_conference.c Sat Sep 23 01:32:10 2006 @@ -2933,8 +2933,6 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { - - if (globals.running) { globals.running = 0; while (globals.threads) { Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.c Sat Sep 23 01:32:10 2006 @@ -33,18 +33,12 @@ #include <switch.h> #include <mod_phonecard.h> -//-- freeTDS includes (XXX: I know, I'll build PostgreSQL and MySQL later) -#include <tds.h> -#include <tdsconvert.h> -#include <ctype.h> +//-- PostgreSQL +#include <libpq-fe.h> -#ifdef FREETDS_PRE_0_63 -#warning "You have older version of FreeTDS, you *NEED* to upgrade!" -#endif - static const char modname[] = "mod_voctel"; static const char global_app_name[] = "phonecard"; -//static char *global_cf_name = "phonecard.conf"; +static char *global_cf_name = "phonecard.conf"; static char *db_hostname = NULL; static char *db_name = NULL; @@ -54,12 +48,13 @@ static char *db_table = NULL; static int db_port = 0; -static TDSSOCKET *tds; -static TDSLOGIN *login; -static TDSCONTEXT *context; - static int db_connected = 0; +/* PostgreSQL declarations */ +PGconn *DBConn; + +switch_mutex_t *db_lock; + //-- main application routine static void phonecard_main(switch_core_session_t *session, char *data) { @@ -94,7 +89,8 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = &phonecard_module_interface; - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); + + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; Modified: freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.h ============================================================================== --- freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.h (original) +++ freeswitch/branches/voctel/src/mod/applications/mod_phonecard/mod_phonecard.h Sat Sep 23 01:32:10 2006 @@ -34,4 +34,7 @@ extern int mssql_connect(void); /*! \brief Function used to connect to MS SQL */ -extern int mssql_disconnect(void); \ No newline at end of file +extern int mssql_disconnect(void); + + +

1 0

[Freeswitch-svn] [commit] r2796 - in freeswitch/branches/tholo: . build libs/codec/g726 libs/codec/g7xx libs/codec/gsm libs/codec/ilbc libs/codec/lpc10
by Freeswitch SVN 23 Sep '06

23 Sep '06

Author: tholo Date: Sat Sep 23 01:28:39 2006 New Revision: 2796 Modified: freeswitch/branches/tholo/Makefile.am freeswitch/branches/tholo/Makefile.in freeswitch/branches/tholo/build/buildlib.sh freeswitch/branches/tholo/build/modmake.sh freeswitch/branches/tholo/libs/codec/g726/Makefile.am freeswitch/branches/tholo/libs/codec/g726/Makefile.in freeswitch/branches/tholo/libs/codec/g7xx/Makefile.am freeswitch/branches/tholo/libs/codec/g7xx/Makefile.in freeswitch/branches/tholo/libs/codec/gsm/Makefile.am freeswitch/branches/tholo/libs/codec/gsm/Makefile.in freeswitch/branches/tholo/libs/codec/ilbc/Makefile.am freeswitch/branches/tholo/libs/codec/ilbc/Makefile.in freeswitch/branches/tholo/libs/codec/lpc10/Makefile.am freeswitch/branches/tholo/libs/codec/lpc10/Makefile.in Log: Do not force use of "gmake" -- but propagate whichever command was used to start the top-level make. This way users on e.g. Mac OS X won't have to create a special symlink to build, but can instead just use the command "gnumake" (as opposed to "make" og "gmake") Modified: freeswitch/branches/tholo/Makefile.am ============================================================================== --- freeswitch/branches/tholo/Makefile.am (original) +++ freeswitch/branches/tholo/Makefile.am Sat Sep 23 01:28:39 2006 @@ -3,8 +3,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS = gnu foreign -AM_MAKE=`which gmake 2>/dev/null || which make 2>/dev/null || echo make` -MAKE=$(AM_MAKE) NAME=freeswitch PREFIX=$(prefix) APR_CONFIG=$(prefix)/bin/apr-1-config @@ -191,7 +189,7 @@ @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done + @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done @rm -f build/freeswitch.env modclean: @@ -199,7 +197,7 @@ @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done + @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i clean || exit 1; done @rm -f build/freeswitch.env everything: install install_mod @@ -231,7 +229,7 @@ @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done + @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done @rm -f build/freeswitch.env @echo done Modified: freeswitch/branches/tholo/Makefile.in ============================================================================== --- freeswitch/branches/tholo/Makefile.in (original) +++ freeswitch/branches/tholo/Makefile.in Sat Sep 23 01:28:39 2006 @@ -243,8 +243,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS = gnu foreign -AM_MAKE = `which gmake 2>/dev/null || which make 2>/dev/null || echo make` -MAKE = $(AM_MAKE) NAME = freeswitch PREFIX = $(prefix) APR_CONFIG = $(prefix)/bin/apr-1-config @@ -1110,7 +1108,7 @@ @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done + @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done @rm -f build/freeswitch.env modclean: @@ -1118,7 +1116,7 @@ @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done + @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i clean || exit 1; done @rm -f build/freeswitch.env everything: install install_mod @@ -1150,7 +1148,7 @@ @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done + @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done @rm -f build/freeswitch.env @echo done Modified: freeswitch/branches/tholo/build/buildlib.sh ============================================================================== --- freeswitch/branches/tholo/build/buildlib.sh (original) +++ freeswitch/branches/tholo/build/buildlib.sh Sat Sep 23 01:28:39 2006 @@ -13,9 +13,9 @@ . $root/build/freeswitch.env fi -if [ -z $MAKE ] ; then +if [ -z "$MAKE" ] ; then make=`which gmake 2>/dev/null` - if [ -z $MAKE ] ; then + if [ -z "$MAKE" ] ; then make=make fi fi @@ -23,7 +23,7 @@ install= base=http://svn.freeswitch.org/downloads/libs -if [ ! -z $1 ] && [ $1 = install ] ; then +if [ ! -z "$1" ] && [ "$1" = install ] ; then install=1 shift fi Modified: freeswitch/branches/tholo/build/modmake.sh ============================================================================== --- freeswitch/branches/tholo/build/modmake.sh (original) +++ freeswitch/branches/tholo/build/modmake.sh Sat Sep 23 01:28:39 2006 @@ -1,4 +1,7 @@ #!/bin/sh + +make=$1 +shift pwd=$1 shift mod=$1 @@ -8,14 +11,8 @@ . $pwd/build/freeswitch.env fi -make=`which gmake` - -if [ -z $make ] ; then - make=`which make` -fi - end=`echo $mod | sed "s/^.*\///g"` -if [ -z $end ] ; then +if [ -z "$end" ] ; then end=$mod fi Modified: freeswitch/branches/tholo/libs/codec/g726/Makefile.am ============================================================================== --- freeswitch/branches/tholo/libs/codec/g726/Makefile.am (original) +++ freeswitch/branches/tholo/libs/codec/g726/Makefile.am Sat Sep 23 01:28:39 2006 @@ -1,7 +1,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS= gnu -MAKE=gmake NAME=libg726 AM_CC=gcc Modified: freeswitch/branches/tholo/libs/codec/g726/Makefile.in ============================================================================== --- freeswitch/branches/tholo/libs/codec/g726/Makefile.in (original) +++ freeswitch/branches/tholo/libs/codec/g726/Makefile.in Sat Sep 23 01:28:39 2006 @@ -202,7 +202,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS = gnu -MAKE = gmake NAME = libg726 AM_CC = gcc AM_CFLAGS = -Wall -O3 -funroll-loops Modified: freeswitch/branches/tholo/libs/codec/g7xx/Makefile.am ============================================================================== --- freeswitch/branches/tholo/libs/codec/g7xx/Makefile.am (original) +++ freeswitch/branches/tholo/libs/codec/g7xx/Makefile.am Sat Sep 23 01:28:39 2006 @@ -1,6 +1,5 @@ AM_CFLAGS = -I./src/include -fPIC -O3 -Dsingle -funroll-loops -fomit-frame-pointer AUTOMAKE_OPTS = gnu -MAKE = gmake NAME = libg7xx lib_LTLIBRARIES = libg7xx.la libg7xx_la_SOURCES = src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c Modified: freeswitch/branches/tholo/libs/codec/g7xx/Makefile.in ============================================================================== --- freeswitch/branches/tholo/libs/codec/g7xx/Makefile.in (original) +++ freeswitch/branches/tholo/libs/codec/g7xx/Makefile.in Sat Sep 23 01:28:39 2006 @@ -193,7 +193,6 @@ target_alias = @target_alias@ AM_CFLAGS = -I./src/include -fPIC -O3 -Dsingle -funroll-loops -fomit-frame-pointer AUTOMAKE_OPTS = gnu -MAKE = gmake NAME = libg7xx lib_LTLIBRARIES = libg7xx.la libg7xx_la_SOURCES = src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c Modified: freeswitch/branches/tholo/libs/codec/gsm/Makefile.am ============================================================================== --- freeswitch/branches/tholo/libs/codec/gsm/Makefile.am (original) +++ freeswitch/branches/tholo/libs/codec/gsm/Makefile.am Sat Sep 23 01:28:39 2006 @@ -1,7 +1,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS= gnu -MAKE=gmake NAME=libgsm AM_CC=gcc Modified: freeswitch/branches/tholo/libs/codec/gsm/Makefile.in ============================================================================== --- freeswitch/branches/tholo/libs/codec/gsm/Makefile.in (original) +++ freeswitch/branches/tholo/libs/codec/gsm/Makefile.in Sat Sep 23 01:28:39 2006 @@ -204,7 +204,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS = gnu -MAKE = gmake NAME = libgsm AM_CC = gcc AM_CFLAGS = -I./inc -DNeedFunctionPrototypes=1 -funroll-loops -fPIC -DSASR -DNDEBUG -DWAV49 Modified: freeswitch/branches/tholo/libs/codec/ilbc/Makefile.am ============================================================================== --- freeswitch/branches/tholo/libs/codec/ilbc/Makefile.am (original) +++ freeswitch/branches/tholo/libs/codec/ilbc/Makefile.am Sat Sep 23 01:28:39 2006 @@ -1,7 +1,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS= gnu -MAKE=gmake NAME=libilbc AM_CC=gcc Modified: freeswitch/branches/tholo/libs/codec/ilbc/Makefile.in ============================================================================== --- freeswitch/branches/tholo/libs/codec/ilbc/Makefile.in (original) +++ freeswitch/branches/tholo/libs/codec/ilbc/Makefile.in Sat Sep 23 01:28:39 2006 @@ -209,7 +209,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS = gnu -MAKE = gmake NAME = libilbc AM_CC = gcc AM_CFLAGS = -Wall -O3 -funroll-loops Modified: freeswitch/branches/tholo/libs/codec/lpc10/Makefile.am ============================================================================== --- freeswitch/branches/tholo/libs/codec/lpc10/Makefile.am (original) +++ freeswitch/branches/tholo/libs/codec/lpc10/Makefile.am Sat Sep 23 01:28:39 2006 @@ -1,7 +1,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS= gnu -MAKE=gmake NAME=libg7xx AM_CC=gcc Modified: freeswitch/branches/tholo/libs/codec/lpc10/Makefile.in ============================================================================== --- freeswitch/branches/tholo/libs/codec/lpc10/Makefile.in (original) +++ freeswitch/branches/tholo/libs/codec/lpc10/Makefile.in Sat Sep 23 01:28:39 2006 @@ -216,7 +216,6 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS = gnu -MAKE = gmake NAME = liblpc10 AM_CC = gcc AM_CFLAGS = -Wall -O3 -funroll-loops

1 0