Changeset 910


Ignore:
Timestamp:
Jan 27, 2007 6:09:28 PM (14 years ago)
Author:
bennylp
Message:

Fixed ticket #82: link error when codec(s) are disabled from configure script (thanks Thomas Reitmayr)

Location:
pjproject/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r862 r910  
    14401440    NONENONEs,x,x, && 
    14411441  program_prefix=${target_alias}- 
    1442                               ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjsip/include/pjsip/sip_autoconf.h" 
     1442                                                  ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h" 
    14431443 
    14441444                                                            ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak" 
     
    84748474  if test "$enable_g711_codec" = "no"; then 
    84758475                ac_no_g711_codec=1 
     8476                cat >>confdefs.h <<\_ACEOF 
     8477#define PJMEDIA_HAS_G711_CODEC 0 
     8478_ACEOF 
     8479 
    84768480                echo "$as_me:$LINENO: result: Checking if G.711 codec is disabled...yes" >&5 
    84778481echo "${ECHO_T}Checking if G.711 codec is disabled...yes" >&6 
     
    84898493  if test "$enable_l16_codec" = "no"; then 
    84908494                ac_no_l16_codec=1 
     8495                cat >>confdefs.h <<\_ACEOF 
     8496#define PJMEDIA_HAS_L16_CODEC 0 
     8497_ACEOF 
     8498 
    84918499                echo "$as_me:$LINENO: result: Checking if L16 codecs are disabled...yes" >&5 
    84928500echo "${ECHO_T}Checking if L16 codecs are disabled...yes" >&6 
     
    85048512  if test "$enable_gsm_codec" = "no"; then 
    85058513                ac_no_gsm_codec=1 
     8514                cat >>confdefs.h <<\_ACEOF 
     8515#define PJMEDIA_HAS_GSM_CODEC 0 
     8516_ACEOF 
     8517 
    85068518                echo "$as_me:$LINENO: result: Checking if GSM codec is disabled...yes" >&5 
    85078519echo "${ECHO_T}Checking if GSM codec is disabled...yes" >&6 
     
    85188530  if test "$enable_speex_codec" = "no"; then 
    85198531                ac_no_speex_codec=1 
     8532                cat >>confdefs.h <<\_ACEOF 
     8533#define PJMEDIA_HAS_SPEEX_CODEC 0 
     8534_ACEOF 
     8535 
    85208536                echo "$as_me:$LINENO: result: Checking if Speex codec is disabled...yes" >&5 
    85218537echo "${ECHO_T}Checking if Speex codec is disabled...yes" >&6 
     
    85328548  if test "$enable_ilbc_codec" = "no"; then 
    85338549                ac_no_ilbc_codec=1 
     8550                cat >>confdefs.h <<\_ACEOF 
     8551#define PJMEDIA_HAS_ILBC_CODEC 0 
     8552_ACEOF 
     8553 
    85348554                echo "$as_me:$LINENO: result: Checking if iLBC codec is disabled...yes" >&5 
    85358555echo "${ECHO_T}Checking if iLBC codec is disabled...yes" >&6 
     
    95019521  "pjlib/include/pj/compat/os_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/os_auto.h" ;; 
    95029522  "pjlib/include/pj/compat/m_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/m_auto.h" ;; 
     9523  "pjmedia/include/pjmedia/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia/config_auto.h" ;; 
     9524  "pjmedia/include/pjmedia-codec/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia-codec/config_auto.h" ;; 
    95039525  "pjsip/include/pjsip/sip_autoconf.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;; 
    95049526  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 
  • pjproject/trunk/pjmedia/include/pjmedia

    • Property svn:ignore set to
      config_auto.h

  • pjproject/trunk/pjmedia/include/pjmedia-codec

    • Property svn:ignore set to
      config_auto.h

  • pjproject/trunk/pjsip-apps/src/samples/pjsip-perf.c

    r815 r910  
    921921 
    922922    /* Must register all codecs to be supported */ 
     923#if defined(PJMEDIA_HAS_G711_CODEC) && PJMEDIA_HAS_G711_CODEC!=0 
    923924    pjmedia_codec_g711_init(app.med_endpt); 
     925#endif 
     926#if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC!=0 
    924927    pjmedia_codec_gsm_init(app.med_endpt); 
     928#endif 
     929#if defined(PJMEDIA_HAS_SPEEX_CODEC) && PJMEDIA_HAS_SPEEX_CODEC!=0 
    925930    pjmedia_codec_speex_init(app.med_endpt, PJMEDIA_SPEEX_NO_UWB, 3, 3); 
    926  
     931#endif 
    927932 
    928933    /* Init dummy socket addresses */ 
Note: See TracChangeset for help on using the changeset viewer.