July 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r1832 - in freeswitch/branches/cypromis: trunk trunk-old
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: cypromis Date: Tue Jul 11 16:52:05 2006 New Revision: 1832 Added: freeswitch/branches/cypromis/trunk-old/ - copied from r1831, /freeswitch/branches/cypromis/trunk/ Removed: freeswitch/branches/cypromis/trunk/ Log: lets archive old stuff and try again fresh

1 0

[commit] r1831 - freeswitch/branches/mm22m83
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 15:22:45 2006 New Revision: 1831 Added: freeswitch/branches/mm22m83/ Log: Creating empty folder for mm22m83

1 0

[commit] r1830 - freeswitch/trunk/src/mod/loggers/mod_syslog
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: anthm Date: Tue Jul 11 13:39:50 2006 New Revision: 1830 Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Log: fix logical error Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Tue Jul 11 13:39:50 2006 @@ -106,12 +106,15 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) { *interface = &console_module_interface; + switch_status_t status; - switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG); + if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { + return status; + } - load_config(); - openlog(globals.ident, LOG_PID, LOG_USER); + + switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG); return SWITCH_STATUS_SUCCESS; } @@ -129,27 +132,28 @@ char *var, *val; char *cf = "syslog.conf"; - if (!switch_config_open_file(&cfg, cf)) { + memset(&globals, 0, sizeof(globals)); + + if (switch_config_open_file(&cfg, cf)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); - return SWITCH_STATUS_TERM; - } - while (switch_config_next_pair(&cfg, &var, &val)) { - if (!strcasecmp(cfg.category, "settings")) { - if (!strcmp(var, "ident")) { - set_global_ident(val); - } else if (!strcmp(var, "facility")) { - set_global_facility(val); - } else if (!strcmp(var, "format")) { - set_global_format(val); - } else if (!strcmp(var, "level")) { - set_global_level(val);; + while (switch_config_next_pair(&cfg, &var, &val)) { + if (!strcasecmp(cfg.category, "settings")) { + if (!strcmp(var, "ident")) { + set_global_ident(val); + } else if (!strcmp(var, "facility")) { + set_global_facility(val); + } else if (!strcmp(var, "format")) { + set_global_format(val); + } else if (!strcmp(var, "level")) { + set_global_level(val);; + } } } + + switch_config_close_file(&cfg); } - switch_config_close_file(&cfg); - if (switch_strlen_zero(globals.ident)) { set_global_ident(DEFAULT_IDENT); }

1 0

[commit] r1829 - freeswitch/branches/bhikubhai
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 06:33:42 2006 New Revision: 1829 Added: freeswitch/branches/bhikubhai/ Log: Creating empty folder for bhikubhai

1 0

[commit] r1828 - freeswitch/branches/tykecom
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 04:12:40 2006 New Revision: 1828 Added: freeswitch/branches/tykecom/ Log: Creating empty folder for tykecom

1 0

[commit] r1827 - freeswitch/branches/vanhuisw
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 01:02:42 2006 New Revision: 1827 Added: freeswitch/branches/vanhuisw/ Log: Creating empty folder for vanhuisw

1 0

[commit] r1826 - freeswitch/branches/vanhui
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 00:31:40 2006 New Revision: 1826 Added: freeswitch/branches/vanhui/ Log: Creating empty folder for vanhui

1 0

[commit] r1825 - freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: stkn Date: Mon Jul 10 21:02:17 2006 New Revision: 1825 Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.h freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip_sdp.c Log: Partially revert mod_pjsip codec handling changes, we might want to traverse the list of implementations for a codec (e.g. renegotiation) in call_on_media_update() Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c Mon Jul 10 21:02:17 2006 @@ -864,7 +864,7 @@ struct pjsip_tech_pvt *pvt; const pjmedia_sdp_session *remote_sdp, *local_sdp; pj_pool_t *pool; - const switch_codec_implementation_t *imp; + const switch_codec_implementation_t *codec, *imp; switch_channel_t *channel; switch_core_session_t *session; switch_status_t ret; @@ -935,7 +935,7 @@ } /* retrieve stream (= codec) information */ - status = mod_pjsip_codec_from_sdp( pvt, pool, local_sdp, remote_sdp, 0, &imp ); + status = mod_pjsip_codec_from_sdp( pvt, pool, local_sdp, remote_sdp, 0, &codec, &imp ); if( status != PJ_SUCCESS ) { /* No valid codec found */ switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SDP negotation failed, codec unknown\n" ); @@ -949,10 +949,10 @@ rate = imp->bits_per_second / 8; ms = imp->microseconds_per_frame / 1000; - switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec %s, rate: %d, ms per frame: %d\n", imp->iananame, rate, ms ); + switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec %s, rate: %d, ms per frame: %d\n", codec->iananame, rate, ms ); /* initialize codecs */ - ret = switch_core_codec_init(&pvt->read_codec, imp->iananame, rate, ms, 1, + ret = switch_core_codec_init(&pvt->read_codec, codec->iananame, rate, ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool( session )); @@ -962,7 +962,7 @@ return; } - ret = switch_core_codec_init(&pvt->write_codec, imp->iananame, rate, ms, 1, + ret = switch_core_codec_init(&pvt->write_codec, codec->iananame, rate, ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool( session )); @@ -991,7 +991,7 @@ strncpy( pvt->remote_sdp_audio_addr, pj_inet_ntoa( tmp_addr ), sizeof(pvt->remote_sdp_audio_addr) ); } - switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec %s, %s:%d\n", imp->iananame, pvt->remote_sdp_audio_addr, pvt->remote_sdp_audio_port ); + switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec %s, %s:%d\n", codec->iananame, pvt->remote_sdp_audio_addr, pvt->remote_sdp_audio_port ); /* start rtp */ start_rtp( pvt ); Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.h ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.h (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.h Mon Jul 10 21:02:17 2006 @@ -42,7 +42,8 @@ const pjmedia_sdp_session *local, const pjmedia_sdp_session *remote, const unsigned int stream_idx, - const switch_codec_implementation_t **codec_imp ); + const switch_codec_implementation_t **codec, + const switch_codec_implementation_t **imp ); /* * Get address from sdp Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip_sdp.c ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip_sdp.c (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip_sdp.c Mon Jul 10 21:02:17 2006 @@ -46,13 +46,15 @@ struct pjsip_tech_pvt *pvt, unsigned int pt, unsigned int clock_rate, - const switch_codec_implementation_t **codec_imp ) + const switch_codec_implementation_t **codec, + const switch_codec_implementation_t **imp ) { const switch_codec_implementation_t *tmp_imp; int i; + assert( codec != NULL ); assert( pvt != NULL ); - assert( codec_imp != NULL ); + assert( imp != NULL ); tmp_imp = NULL; for( i = 0; i < pvt->num_codecs; i++ ) { @@ -62,7 +64,8 @@ while( tmp_imp != NULL ) { if ( tmp_imp->samples_per_second == clock_rate ) { - *codec_imp = tmp_imp; + *codec = pvt->codecs[i]; + *imp = tmp_imp; return PJ_SUCCESS; } @@ -80,7 +83,8 @@ const pjmedia_sdp_session *local, const pjmedia_sdp_session *remote, const unsigned int stream_idx, - const switch_codec_implementation_t **codec_imp ) + const switch_codec_implementation_t **codec, + const switch_codec_implementation_t **imp ) { const pjmedia_sdp_attr *attr; const pjmedia_sdp_media *local_m; @@ -93,7 +97,8 @@ assert( pool != NULL ); assert( local != NULL ); assert( remote != NULL ); - assert( codec_imp != NULL ); + assert( codec != NULL ); + assert( imp != NULL ); assert( stream_idx < local->media_count ); assert( stream_idx < remote->media_count ); @@ -134,14 +139,14 @@ /* Build codec format info: */ if (has_rtpmap) { - status = find_codec( pvt, pt, rtpmap->clock_rate, codec_imp ); + status = find_codec( pvt, pt, rtpmap->clock_rate, codec, imp ); if( status != PJ_SUCCESS ) return PJ_ENOTFOUND; } else { /* * No rtpmap, use default clock_rate (8000 Hz) */ - status = find_codec( pvt, pt, 8000, codec_imp ); + status = find_codec( pvt, pt, 8000, codec, imp ); if( status != PJ_SUCCESS ) return PJ_ENOTFOUND; }

1 0

[commit] r1824 - freeswitch/branches/stkn
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: stkn Date: Mon Jul 10 20:47:08 2006 New Revision: 1824 Modified: freeswitch/branches/stkn/Makefile.in freeswitch/branches/stkn/configure freeswitch/branches/stkn/configure.in Log: configure arch and os detection tweaks Modified: freeswitch/branches/stkn/Makefile.in ============================================================================== --- freeswitch/branches/stkn/Makefile.in (original) +++ freeswitch/branches/stkn/Makefile.in Mon Jul 10 20:47:08 2006 @@ -181,6 +181,8 @@ ISMAC_TRUE = @ISMAC_TRUE@ ISPPC_FALSE = @ISPPC_FALSE@ ISPPC_TRUE = @ISPPC_TRUE@ +ISSUN_FALSE = @ISSUN_FALSE@ +ISSUN_TRUE = @ISSUN_TRUE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ Modified: freeswitch/branches/stkn/configure ============================================================================== --- freeswitch/branches/stkn/configure (original) +++ freeswitch/branches/stkn/configure Mon Jul 10 20:47:08 2006 @@ -466,7 +466,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE ISPPC_TRUE ISPPC_FALSE ISGCC_TRUE ISGCC_FALSE USE_GCCVISIBILITY_TRUE USE_GCCVISIBILITY_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE ISSUN_TRUE ISSUN_FALSE ISPPC_TRUE ISPPC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE ISGCC_TRUE ISGCC_FALSE USE_GCCVISIBILITY_TRUE USE_GCCVISIBILITY_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -20801,9 +20801,32 @@ ac_config_files="$ac_config_files Makefile" +# +# OS detection +# +if test -z "$OS" +then + case `uname -s` in + Linux|linux) + OS="LINUX" + ;; + Darwin|darwin) + OS="DARWIN" + ;; + SunOS) + OS="SUNOS" + ;; + *) + OS="`uname -s`" + ;; + esac +fi +OS="`echo $OS | tr ':lower:' ':upper:'`" -if test `uname -s` = Linux; then + + +if test "$OS" = "LINUX"; then ISLINUX_TRUE= ISLINUX_FALSE='#' else @@ -20813,7 +20836,7 @@ -if test `uname -s` = Darwin; then +if test "$OS" = "DARWIN"; then ISMAC_TRUE= ISMAC_FALSE='#' else @@ -20823,30 +20846,46 @@ -if test `uname -m` = x86_64; then - IS64BITLINUX_TRUE= - IS64BITLINUX_FALSE='#' +if test "$OS" = "SUNOS"; then + ISSUN_TRUE= + ISSUN_FALSE='#' else - IS64BITLINUX_TRUE='#' - IS64BITLINUX_FALSE= + ISSUN_TRUE='#' + ISSUN_FALSE= fi +cat >>confdefs.h <<\_ACEOF +#define FS_OS_$OS 1 +_ACEOF + + # AM_CONDITIONAL(ISSUNOS, [test `uname -s` = SunOS]) # AM_CONDITIONAL(ISSUN64, [test `isainfo -b` = 64]) # AM_CONDITIONAL(ISSUNSPARC, [test `isainfo -n` = sparcv9]) -case `uname -m` in - ppc|ppc64|powerpc) - MACHINE="ppc" - ;; - *) - MACHINE="`uname -m`" - ;; -esac +# +# Machine detection +# +if test -z "$MACHINE" +then + case `uname -m` in + ppc|ppc64|powerpc) + MACHINE="PPC" + ;; + x86_64|x64|amd64) + MACHINE="X86_64" + ;; + *) + MACHINE="`uname -m`" + ;; + esac +fi +MACHINE="`echo $MACHINE | tr ':lower:' ':upper:'`" -if test "$MACHINE" = "ppc"; then + +if test "$MACHINE" = "PPC"; then ISPPC_TRUE= ISPPC_FALSE='#' else @@ -20854,8 +20893,30 @@ ISPPC_FALSE= fi +cat >>confdefs.h <<\_ACEOF +#define FS_ARCH_$MACHINE 1 +_ACEOF +# +# Misc Machine + OS +# + + +if test "$MACHINE" = "X86_64" -a "$OS" = "LINUX"; then + IS64BITLINUX_TRUE= + IS64BITLINUX_FALSE='#' +else + IS64BITLINUX_TRUE='#' + IS64BITLINUX_FALSE= +fi + + +# +# Compiler detection +# + + if test "$GCC" = "yes"; then ISGCC_TRUE= ISGCC_FALSE='#' @@ -20877,7 +20938,7 @@ fi; GCC_VER=0 -if test "x$GCC" = "xyes" && test "x$enable_visibility" = "xyes" +if test "x$GCC" = "xyes" && test "x$enable_visibility" != "xno" then # check gcc version echo "$as_me:$LINENO: checking GCC Version" >&5 @@ -21031,10 +21092,10 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${IS64BITLINUX_TRUE}" && test -z "${IS64BITLINUX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"IS64BITLINUX\" was never defined. +if test -z "${ISSUN_TRUE}" && test -z "${ISSUN_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ISSUN\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"IS64BITLINUX\" was never defined. +echo "$as_me: error: conditional \"ISSUN\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -21045,6 +21106,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${IS64BITLINUX_TRUE}" && test -z "${IS64BITLINUX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"IS64BITLINUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"IS64BITLINUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${ISGCC_TRUE}" && test -z "${ISGCC_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"ISGCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -21664,10 +21732,12 @@ s,@ISLINUX_FALSE@,$ISLINUX_FALSE,;t t s,@ISMAC_TRUE@,$ISMAC_TRUE,;t t s,@ISMAC_FALSE@,$ISMAC_FALSE,;t t -s,@IS64BITLINUX_TRUE@,$IS64BITLINUX_TRUE,;t t -s,@IS64BITLINUX_FALSE@,$IS64BITLINUX_FALSE,;t t +s,@ISSUN_TRUE@,$ISSUN_TRUE,;t t +s,@ISSUN_FALSE@,$ISSUN_FALSE,;t t s,@ISPPC_TRUE@,$ISPPC_TRUE,;t t s,@ISPPC_FALSE@,$ISPPC_FALSE,;t t +s,@IS64BITLINUX_TRUE@,$IS64BITLINUX_TRUE,;t t +s,@IS64BITLINUX_FALSE@,$IS64BITLINUX_FALSE,;t t s,@ISGCC_TRUE@,$ISGCC_TRUE,;t t s,@ISGCC_FALSE@,$ISGCC_FALSE,;t t s,@USE_GCCVISIBILITY_TRUE@,$USE_GCCVISIBILITY_TRUE,;t t Modified: freeswitch/branches/stkn/configure.in ============================================================================== --- freeswitch/branches/stkn/configure.in (original) +++ freeswitch/branches/stkn/configure.in Mon Jul 10 20:47:08 2006 @@ -47,23 +47,69 @@ AC_CONFIG_FILES([Makefile]) -AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux]) -AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin]) -AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64]) +# +# OS detection +# +if test -z "$OS" +then + case `uname -s` in + Linux|linux) + OS="LINUX" + ;; + Darwin|darwin) + OS="DARWIN" + ;; + SunOS) + OS="SUNOS" + ;; + *) + OS="`uname -s`" + ;; + esac +fi +OS="`echo $OS | tr '[:lower:]' '[:upper:]'`" + + +AM_CONDITIONAL([ISLINUX], [test "$OS" = "LINUX"]) +AM_CONDITIONAL([ISMAC], [test "$OS" = "DARWIN"]) +AM_CONDITIONAL([ISSUN], [test "$OS" = "SUNOS"]) +AC_DEFINE([FS_OS_$OS],[1]) + # AM_CONDITIONAL(ISSUNOS, [test `uname -s` = SunOS]) # AM_CONDITIONAL(ISSUN64, [test `isainfo -b` = 64]) # AM_CONDITIONAL(ISSUNSPARC, [test `isainfo -n` = sparcv9]) -case `uname -m` in - ppc|ppc64|powerpc) - MACHINE="ppc" - ;; - *) - MACHINE="`uname -m`" - ;; -esac +# +# Machine detection +# +if test -z "$MACHINE" +then + case `uname -m` in + ppc|ppc64|powerpc) + MACHINE="PPC" + ;; + x86_64|x64|amd64) + MACHINE="X86_64" + ;; + *) + MACHINE="`uname -m`" + ;; + esac +fi +MACHINE="`echo $MACHINE | tr '[:lower:]' '[:upper:]'`" -AM_CONDITIONAL(ISPPC, [test "$MACHINE" = "ppc"]) + +AM_CONDITIONAL(ISPPC, [test "$MACHINE" = "PPC"]) +AC_DEFINE([FS_ARCH_$MACHINE],[1]) + +# +# Misc Machine + OS +# +AM_CONDITIONAL([IS64BITLINUX], [test "$MACHINE" = "X86_64" -a "$OS" = "LINUX"]) + +# +# Compiler detection +# AM_CONDITIONAL(ISGCC, [test "$GCC" = "yes"]) # @@ -74,7 +120,7 @@ [Enable -fvisibility=hidden on Linux systems with GCC 4.0 and higher])],,[enable_visibility="no"]) GCC_VER=0 -if test "x$GCC" = "xyes" && test "x$enable_visibility" = "xyes" +if test "x$GCC" = "xyes" && test "x$enable_visibility" != "xno" then # check gcc version AC_MSG_CHECKING([GCC Version])

1 0

[commit] r1823 - freeswitch/branches/sajjads
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Mon Jul 10 20:26:43 2006 New Revision: 1823 Added: freeswitch/branches/sajjads/ Log: Creating empty folder for sajjads

1 0