- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6303 - in freeswitch/trunk/conf: . dialplan
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:01:02 2007 New Revision: 6303 Modified: freeswitch/trunk/conf/cdr.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/modules.conf.xml Log: woops Modified: freeswitch/trunk/conf/cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/cdr.conf.xml (original) +++ freeswitch/trunk/conf/cdr.conf.xml Fri Nov 16 09:01:02 2007 @@ -1,4 +1,4 @@ -<configuration name="mod_cdr.conf" description="CDR Configuration"> +<configuration name="cdr.conf" description="CDR Configuration"> <pddcdr> <param name="path" value="/work/temp/pddcdr"/>  Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 16 09:01:02 2007 @@ -2,6 +2,7 @@ <extension name="global" continue="true"> <condition> <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> + <action application="info"/> </condition>  <load module="mod_console"/>  @@ -26,7 +27,7 @@    -  + <load module="mod_portaudio"/>  <load module="mod_sofia"/>

1 0

[commit] r6302 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 08:47:33 2007 New Revision: 6302 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: lets actually use the var we set. Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 16 08:47:33 2007 @@ -46,7 +46,7 @@  <extension name="FS_Conf_SIP"> <condition field="destination_number" expression="^888$"> - <action application="bridge" data="sofia/default/888(a)conference.freeswitch.org"/> + <action application="bridge" data="sofia/${use_profile}/888(a)conference.freeswitch.org"/> </condition> </extension>

1 0

[commit] r6301 - in freeswitch/trunk: . w32/Library
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Fri Nov 16 00:47:25 2007 New Revision: 6301 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: windows build tweaks. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Fri Nov 16 00:47:25 2007 @@ -434,8 +434,6 @@ conf\freeswitch.xml = conf\freeswitch.xml conf\iax.conf.xml = conf\iax.conf.xml conf\ivr.conf.xml = conf\ivr.conf.xml - conf\lang_fr.xml = conf\lang_fr.xml - conf\mod_cdr.conf.xml = conf\mod_cdr.conf.xml conf\modules.conf.xml = conf\modules.conf.xml conf\portaudio.conf.xml = conf\portaudio.conf.xml conf\rss.conf.xml = conf\rss.conf.xml Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Fri Nov 16 00:47:25 2007 @@ -465,6 +465,10 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File + RelativePath="..\..\src\include\SimpleGlob.h" + > + </File> + <File RelativePath="..\..\libs\stfu\stfu.h" > </File> @@ -501,11 +505,11 @@ > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File

1 0

[commit] r6300 - freeswitch/trunk/src
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Fri Nov 16 00:47:00 2007 New Revision: 6300 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: silence some sun-cc build errors. Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Nov 16 00:47:00 2007 @@ -1375,7 +1375,7 @@ return mod; } -#define ALLOC_INTERFACE(_TYPE_) for(;;) { \ +#define ALLOC_INTERFACE(_TYPE_) { \ switch_##_TYPE_##_interface_t *i, *ptr; \ i = switch_core_alloc(mod->pool, sizeof(switch_##_TYPE_##_interface_t)); \ assert(i != NULL); \ @@ -1394,43 +1394,43 @@ switch(iname) { case SWITCH_ENDPOINT_INTERFACE: - ALLOC_INTERFACE(endpoint); + ALLOC_INTERFACE(endpoint) case SWITCH_TIMER_INTERFACE: - ALLOC_INTERFACE(timer); + ALLOC_INTERFACE(timer) case SWITCH_DIALPLAN_INTERFACE: - ALLOC_INTERFACE(dialplan); + ALLOC_INTERFACE(dialplan) case SWITCH_CODEC_INTERFACE: - ALLOC_INTERFACE(codec); + ALLOC_INTERFACE(codec) case SWITCH_APPLICATION_INTERFACE: - ALLOC_INTERFACE(application); + ALLOC_INTERFACE(application) case SWITCH_API_INTERFACE: - ALLOC_INTERFACE(api); + ALLOC_INTERFACE(api) case SWITCH_FILE_INTERFACE: - ALLOC_INTERFACE(file); + ALLOC_INTERFACE(file) case SWITCH_SPEECH_INTERFACE: - ALLOC_INTERFACE(speech); + ALLOC_INTERFACE(speech) case SWITCH_DIRECTORY_INTERFACE: - ALLOC_INTERFACE(directory); + ALLOC_INTERFACE(directory) case SWITCH_CHAT_INTERFACE: - ALLOC_INTERFACE(chat); + ALLOC_INTERFACE(chat) case SWITCH_SAY_INTERFACE: - ALLOC_INTERFACE(say); + ALLOC_INTERFACE(say) case SWITCH_ASR_INTERFACE: - ALLOC_INTERFACE(asr); + ALLOC_INTERFACE(asr) case SWITCH_MANAGEMENT_INTERFACE: - ALLOC_INTERFACE(management); + ALLOC_INTERFACE(management) default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid Module Type!\n");

1 0

[commit] r6299 - in freeswitch/trunk/libs/js: . nsprpub
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Fri Nov 16 00:07:35 2007 New Revision: 6299 Modified: freeswitch/trunk/libs/js/Makefile.in freeswitch/trunk/libs/js/configure.ac freeswitch/trunk/libs/js/nsprpub/configure.in Log: add --enable-64 configure flag to build 64 bit with suncc Modified: freeswitch/trunk/libs/js/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/Makefile.in (original) +++ freeswitch/trunk/libs/js/Makefile.in Fri Nov 16 00:07:35 2007 @@ -159,7 +159,7 @@ @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) -version-info 1:6 $(CLI_NAME): $(CLI_OBJS) $(LIB_NAME) - @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS) + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) $(CFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS) src/js.o: src/js.c $(CC) $(CPPFLAGS) $(CLI_CPPFLAGS) $(CFLAGS) $(CLI_CFLAGS) -o $@ -c $< src/perlconnect/jsperl.o: src/perlconnect/jsperl.c @@ -172,7 +172,7 @@ jscpucfg.o: src/jscpucfg.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< jscpucfg: jscpucfg.o - @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o jscpucfg jscpucfg.o $(LIBS) + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o jscpucfg jscpucfg.o $(LIBS) src/jsopcode.h src/jsopcode.c: src/jsopcode.tbl .PHONY: install Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Fri Nov 16 00:07:35 2007 @@ -174,6 +174,35 @@ LIBPATH="LD_LIBRARY_PATH=./nsprpub/dist/lib DYLD_LIBRARY_PATH=./nsprpub/dist/lib" fi +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + CFLAGS="$CFLAGS -m64" + CXXFLAGS="$CXXFLAGS -m64" + fi +fi + AC_SUBST(CLI_CFLAGS) AC_SUBST(CLI_CPPFLAGS) AC_SUBST(CLI_LDFLAGS) Modified: freeswitch/trunk/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure.in (original) +++ freeswitch/trunk/libs/js/nsprpub/configure.in Fri Nov 16 00:07:35 2007 @@ -223,6 +223,14 @@ USE_64=1 fi ]) +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "${enable_64}" = "yes"; then + USE_64=1 +fi + AC_ARG_ENABLE(mdupdate, [ --enable-mdupdate Enable use of certain compilers' mdupdate feature], [ if test "$enableval" = "yes"; then @@ -2660,6 +2668,7 @@ ;; esac + dnl ======================================================== dnl Substitution of found variables. dnl ========================================================

1 0

[commit] r6298 - freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Thu Nov 15 23:38:09 2007 New Revision: 6298 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in Log: add --enable-64 configure flag to build 64 bit with suncc Modified: freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in Thu Nov 15 23:38:09 2007 @@ -124,7 +124,8 @@ LIBS = @LIBS@ libxmlrpc_xmlparse_la_LIBADD = libxmlrpc_xmlparse_la_OBJECTS = xmlparse.lo -CFLAGS = @CFLAGS@ +COMPILER_CFLAGS = @COMPILER_CFLAGS@ +CFLAGS = @CFLAGS@ $(COMPILER_CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC)

1 0

[commit] r6297 - in freeswitch/trunk/libs/xmlrpc-c: . lib/expat/gennmtab src
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Thu Nov 15 23:26:00 2007 New Revision: 6297 Modified: freeswitch/trunk/libs/xmlrpc-c/Makefile.common freeswitch/trunk/libs/xmlrpc-c/Makefile.config.in freeswitch/trunk/libs/xmlrpc-c/configure.in freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/Makefile freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_builddecomp.c Log: add --enable-64 configure flag to build 64 bit with suncc Modified: freeswitch/trunk/libs/xmlrpc-c/Makefile.common ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/Makefile.common (original) +++ freeswitch/trunk/libs/xmlrpc-c/Makefile.common Thu Nov 15 23:26:00 2007 @@ -23,11 +23,15 @@ GCC_CXX_WARNINGS = $(GCC_WARNINGS) -Woverloaded-virtual -Wsynth ifeq ($(C_COMPILER_GNU),yes) - CFLAGS_COMMON = $(GCC_C_WARNINGS) -fno-common -g + CFLAGS_COMMON = $(GCC_C_WARNINGS) $(COMPILER_CFLAGS) -fno-common -g +else + CFLAGS_COMMON = $(COMPILER_CFLAGS) endif ifeq ($(CXX_COMPILER_GNU),yes) - CXXFLAGS_COMMON = $(GCC_CXX_WARNINGS) + CXXFLAGS_COMMON = $(GCC_CXX_WARNINGS) $(COMPILER_CXXFLAGS) +else + CXXFLAGS_COMMON = $(COMPILER_CXXFLAGS) endif DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR) Modified: freeswitch/trunk/libs/xmlrpc-c/Makefile.config.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/Makefile.config.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/Makefile.config.in Thu Nov 15 23:26:00 2007 @@ -57,6 +57,8 @@ C_COMPILER_GNU = @C_COMPILER_GNU@ CXX_COMPILER_GNU = @CXX_COMPILER_GNU@ +COMPILER_CFLAGS = @COMPILER_CFLAGS@ +COMPILER_CXXFLAGS = @COMPILER_CXXFLAGS@ # Here are the commands 'make install' uses to install various kinds of files: Modified: freeswitch/trunk/libs/xmlrpc-c/configure.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/configure.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/configure.in Thu Nov 15 23:26:00 2007 @@ -633,6 +633,40 @@ BUILDDIR=`pwd` AC_SUBST(BUILDDIR) + + +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + COMPILER_CFLAGS=-m64 + COMPILER_CXXFLAGS=-m64 + fi +fi + +AC_SUBST(COMPILER_CFLAGS) +AC_SUBST(COMPILER_CXXFLAGS) + dnl ======================================================================= dnl Libtool dnl ======================================================================= Modified: freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/Makefile ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/Makefile (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/expat/gennmtab/Makefile Thu Nov 15 23:26:00 2007 @@ -40,6 +40,6 @@ $(CC) -c $< -o $@ $(CFLAGS) $(INCLUDES) gennmtab:%:%.o - $(LINK) -o $@ $(LDFLAGS) $^ + $(LINK) -o $@ $(LDFLAGS) $(CFLAGS) $^ include Makefile.depend Modified: freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_builddecomp.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_builddecomp.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_builddecomp.c Thu Nov 15 23:26:00 2007 @@ -27,8 +27,12 @@ #if VA_LIST_IS_ARRAY #define VA_LIST_COPY(dest,src) memcpy((dest), (src), sizeof(va_list)) #else +#if __sun +#define VA_LIST_COPY(dest,src) (*(dest) = *(src)) +#else #define VA_LIST_COPY(dest,src) ((dest) = (src)) #endif +#endif /*========================================================================= ** Creating XML-RPC values.

1 0

[commit] r6296 - in freeswitch/trunk/libs: curl curl/lib iax iksemel libdingaling libsndfile sofia-sip
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Thu Nov 15 22:35:07 2007 New Revision: 6296 Modified: freeswitch/trunk/libs/curl/configure.ac freeswitch/trunk/libs/curl/lib/config.h.in freeswitch/trunk/libs/iax/configure.in freeswitch/trunk/libs/iksemel/configure.ac freeswitch/trunk/libs/libdingaling/configure.in freeswitch/trunk/libs/libsndfile/configure.ac freeswitch/trunk/libs/sofia-sip/configure.ac Log: add --enable-64 configure flag to build 64 bit with suncc Modified: freeswitch/trunk/libs/curl/configure.ac ============================================================================== --- freeswitch/trunk/libs/curl/configure.ac (original) +++ freeswitch/trunk/libs/curl/configure.ac Thu Nov 15 22:35:07 2007 @@ -2043,6 +2043,34 @@ LIBS="$LIBS -lws2_32" fi +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + CFLAGS="$CFLAGS -m64" + CXXFLAGS="$CXXFLAGS -m64" + fi +fi AM_CONDITIONAL(CROSSCOMPILING, test x$cross_compiling = xyes) Modified: freeswitch/trunk/libs/curl/lib/config.h.in ============================================================================== --- freeswitch/trunk/libs/curl/lib/config.h.in (original) +++ freeswitch/trunk/libs/curl/lib/config.h.in Thu Nov 15 22:35:07 2007 @@ -621,16 +621,16 @@ /* Define to the function return type for send. */ #undef SEND_TYPE_RETV -/* The size of a `curl_off_t', as computed by sizeof. */ +/* The size of `curl_off_t', as computed by sizeof. */ #undef SIZEOF_CURL_OFF_T -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of a `time_t', as computed by sizeof. */ +/* The size of `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T /* Define to 1 if you have the ANSI C header files. */ @@ -685,7 +685,7 @@ /* type to use in place of in_addr_t if not defined */ #undef in_addr_t -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t /* type to use in place of socklen_t if not defined */ Modified: freeswitch/trunk/libs/iax/configure.in ============================================================================== --- freeswitch/trunk/libs/iax/configure.in (original) +++ freeswitch/trunk/libs/iax/configure.in Thu Nov 15 22:35:07 2007 @@ -99,6 +99,17 @@ IN_LINE=inline ;; esac +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + new_AM_CFLAGS="$new_AM_CFLAGS -m64" + fi +fi + + AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) Modified: freeswitch/trunk/libs/iksemel/configure.ac ============================================================================== --- freeswitch/trunk/libs/iksemel/configure.ac (original) +++ freeswitch/trunk/libs/iksemel/configure.ac Thu Nov 15 22:35:07 2007 @@ -55,6 +55,35 @@ fi fi +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + CFLAGS="$CFLAGS -m64" + CXXFLAGS="$CXXFLAGS -m64" + fi +fi + dnl Generating makefiles AC_CONFIG_FILES([ Makefile Modified: freeswitch/trunk/libs/libdingaling/configure.in ============================================================================== --- freeswitch/trunk/libs/libdingaling/configure.in (original) +++ freeswitch/trunk/libs/libdingaling/configure.in Thu Nov 15 22:35:07 2007 @@ -105,6 +105,17 @@ DYNAMIC_LIB_EXTEN="so" IN_LINE=inline esac + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + new_AM_CFLAGS="$new_AM_CFLAGS -m64" + fi +fi + AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) Modified: freeswitch/trunk/libs/libsndfile/configure.ac ============================================================================== --- freeswitch/trunk/libs/libsndfile/configure.ac (original) +++ freeswitch/trunk/libs/libsndfile/configure.ac Thu Nov 15 22:35:07 2007 @@ -460,6 +460,35 @@ AC_DEFINE_UNQUOTED([GCC_MAJOR_VERSION],${GCC_MAJOR_VERSION}, [Major version of GCC or 3 otherwise.]) fi +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + CFLAGS="$CFLAGS -m64" + fi +fi + + CFLAGS="$CFLAGS $OS_SPECIFIC_CFLAGS" if test x"$CFLAGS" = x ; then Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Thu Nov 15 22:35:07 2007 @@ -230,6 +230,35 @@ AC_SYS_SA_LEN +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + SOFIA_CFLAGS="$SOFIA_CFLAGS -m64" + fi +fi + + ### checks for library functions ### ----------------------------

1 0

[commit] r6295 - freeswitch/trunk/src/mod/codecs/mod_speex
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Thu Nov 15 20:55:29 2007 New Revision: 6295 Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile Log: only build libspeex, avoiding building the sample programs, and errors in build if libogg is not available Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/Makefile Thu Nov 15 20:55:29 2007 @@ -8,5 +8,5 @@ include $(BASE)/build/modmake.rules $(SPEEXLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update - cd $(SPEEX_DIR) && $(MAKE) + cd $(SPEEX_DIR)/libspeex && $(MAKE) $(TOUCH_TARGET)

1 0

[commit] r6294 - in freeswitch/trunk/libs: codec/g726 codec/g7xx codec/gsm codec/ilbc codec/lpc10 speex
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Thu Nov 15 20:45:29 2007 New Revision: 6294 Modified: freeswitch/trunk/libs/codec/g726/configure.in freeswitch/trunk/libs/codec/g7xx/configure.in freeswitch/trunk/libs/codec/gsm/configure.in freeswitch/trunk/libs/codec/ilbc/configure.in freeswitch/trunk/libs/codec/lpc10/configure.ac freeswitch/trunk/libs/speex/configure.ac freeswitch/trunk/libs/speex/configure.gnu Log: add --enable-64 configure flag to build 64 bit with suncc Modified: freeswitch/trunk/libs/codec/g726/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/g726/configure.in (original) +++ freeswitch/trunk/libs/codec/g726/configure.in Thu Nov 15 20:45:29 2007 @@ -85,6 +85,15 @@ DYNAMIC_LIB_EXTEN="so" ;; esac +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + new_AM_CFLAGS="$new_AM_CFLAGS -m64" + fi +fi AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) Modified: freeswitch/trunk/libs/codec/g7xx/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/g7xx/configure.in (original) +++ freeswitch/trunk/libs/codec/g7xx/configure.in Thu Nov 15 20:45:29 2007 @@ -88,6 +88,17 @@ IN_LINE=inline ;; esac + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + new_AM_CFLAGS="$new_AM_CFLAGS -m64" + fi +fi + AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) Modified: freeswitch/trunk/libs/codec/gsm/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/gsm/configure.in (original) +++ freeswitch/trunk/libs/codec/gsm/configure.in Thu Nov 15 20:45:29 2007 @@ -12,6 +12,35 @@ AC_PROG_LIBTOOL AC_PROG_INSTALL +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + CFLAGS="$CFLAGS -m64" + CXXFLAGS="$CXXFLAGS -m64" + fi +fi + # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC Modified: freeswitch/trunk/libs/codec/ilbc/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/ilbc/configure.in (original) +++ freeswitch/trunk/libs/codec/ilbc/configure.in Thu Nov 15 20:45:29 2007 @@ -91,6 +91,15 @@ IN_LINE=inline ;; esac +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + new_AM_CFLAGS="$new_AM_CFLAGS -m64" + fi +fi AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) Modified: freeswitch/trunk/libs/codec/lpc10/configure.ac ============================================================================== --- freeswitch/trunk/libs/codec/lpc10/configure.ac (original) +++ freeswitch/trunk/libs/codec/lpc10/configure.ac Thu Nov 15 20:45:29 2007 @@ -83,6 +83,15 @@ DYNAMIC_LIB_EXTEN="so" ;; esac +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + new_AM_CFLAGS="$new_AM_CFLAGS -m64" + fi +fi AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) Modified: freeswitch/trunk/libs/speex/configure.ac ============================================================================== --- freeswitch/trunk/libs/speex/configure.ac (original) +++ freeswitch/trunk/libs/speex/configure.ac Thu Nov 15 20:45:29 2007 @@ -185,6 +185,36 @@ AC_SUBST(SIZE16) AC_SUBST(SIZE32) + +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + CFLAGS="$CFLAGS -m64" + CXXFLAGS="$CXXFLAGS -m64" + fi +fi + AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec include/Makefile include/speex/Makefile speex.pc win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile Modified: freeswitch/trunk/libs/speex/configure.gnu ============================================================================== --- freeswitch/trunk/libs/speex/configure.gnu (original) +++ freeswitch/trunk/libs/speex/configure.gnu Thu Nov 15 20:45:29 2007 @@ -1,2 +1,2 @@ #! /bin/sh -./configure "$@" --disable-shared --with-pic +./configure "$@" --disable-shared --with-pic --disable-oggtest

1 0