Changeset 909


Ignore:
Timestamp:
Jan 27, 2007 5:44:13 PM (14 years ago)
Author:
bennylp
Message:

Ticket #82: fix link errors when codecs are disabled from autoconf script

Location:
pjproject/trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure.ac

    r862 r909  
    88AC_CONFIG_HEADER([pjlib/include/pj/compat/os_auto.h 
    99                  pjlib/include/pj/compat/m_auto.h 
     10                  pjmedia/include/pjmedia/config_auto.h 
     11                  pjmedia/include/pjmedia-codec/config_auto.h 
    1012                  pjsip/include/pjsip/sip_autoconf.h 
    1113                 ]) 
     
    333335              [if test "$enable_g711_codec" = "no"; then 
    334336                [ac_no_g711_codec=1] 
     337                AC_DEFINE(PJMEDIA_HAS_G711_CODEC,0) 
    335338                AC_MSG_RESULT([Checking if G.711 codec is disabled...yes]) 
    336339               fi], 
     
    345348              [if test "$enable_l16_codec" = "no"; then 
    346349                [ac_no_l16_codec=1] 
     350                AC_DEFINE(PJMEDIA_HAS_L16_CODEC,0) 
    347351                AC_MSG_RESULT([Checking if L16 codecs are disabled...yes]) 
    348352               fi], 
     
    357361              [if test "$enable_gsm_codec" = "no"; then 
    358362                [ac_no_gsm_codec=1] 
     363                AC_DEFINE(PJMEDIA_HAS_GSM_CODEC,0) 
    359364                AC_MSG_RESULT([Checking if GSM codec is disabled...yes]) 
    360365               fi], 
     
    368373              [if test "$enable_speex_codec" = "no"; then 
    369374                [ac_no_speex_codec=1] 
     375                AC_DEFINE(PJMEDIA_HAS_SPEEX_CODEC,0) 
    370376                AC_MSG_RESULT([Checking if Speex codec is disabled...yes]) 
    371377               fi], 
     
    379385              [if test "$enable_ilbc_codec" = "no"; then 
    380386                [ac_no_ilbc_codec=1] 
     387                AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC,0) 
    381388                AC_MSG_RESULT([Checking if iLBC codec is disabled...yes]) 
    382389               fi], 
  • pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

    r637 r909  
    2222#include <pjmedia/types.h> 
    2323 
     24/* 
     25 * Include config_auto.h if autoconf is used (PJ_AUTOCONF is set) 
     26 */ 
     27#if defined(PJ_AUTOCONF) 
     28#   include <pjmedia-codec/config_auto.h> 
     29#endif 
    2430 
    2531/** 
     
    5763 
    5864#endif  /* __PJMEDIA_CODEC_CONFIG_H__ */ 
     65 
  • pjproject/trunk/pjmedia/include/pjmedia/config.h

    r899 r909  
    3737 * @{ 
    3838 */ 
     39 
     40/* 
     41 * Include config_auto.h if autoconf is used (PJ_AUTOCONF is set) 
     42 */ 
     43#if defined(PJ_AUTOCONF) 
     44#   include <pjmedia/config_auto.h> 
     45#endif 
    3946 
    4047/* 
     
    9299/** 
    93100 * Unless specified otherwise, G711 codec is included by default. 
    94  * Note that there are parts of G711 codec (such as linear2ulaw) that are  
    95  * needed by other PJMEDIA components (e.g. silence detector, conference). 
    96  * Thus disabling G711 is generally not a good idea. 
    97101 */ 
    98102#ifndef PJMEDIA_HAS_G711_CODEC 
Note: See TracChangeset for help on using the changeset viewer.