Changeset 910 for pjproject/trunk

Timestamp:

Jan 27, 2007 6:09:28 PM (18 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:

• aconfigure (modified) (7 diffs)
• pjmedia/include/pjmedia (modified) (1 prop)
• pjmedia/include/pjmedia-codec (modified) (1 prop)
• pjsip-apps/src/samples/pjsip-perf.c (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -1440 +1440 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
-                              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"
+                                                  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"
 
                                                             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"
@@ -8474 +8474 @@
   if test "$enable_g711_codec" = "no"; then
                 ac_no_g711_codec=1
+                cat >>confdefs.h <<\_ACEOF
+#define PJMEDIA_HAS_G711_CODEC 0
+_ACEOF
+
                 echo "$as_me:$LINENO: result: Checking if G.711 codec is disabled...yes" >&5
 echo "${ECHO_T}Checking if G.711 codec is disabled...yes" >&6
@@ -8489 +8493 @@
   if test "$enable_l16_codec" = "no"; then
                 ac_no_l16_codec=1
+                cat >>confdefs.h <<\_ACEOF
+#define PJMEDIA_HAS_L16_CODEC 0
+_ACEOF
+
                 echo "$as_me:$LINENO: result: Checking if L16 codecs are disabled...yes" >&5
 echo "${ECHO_T}Checking if L16 codecs are disabled...yes" >&6
@@ -8504 +8512 @@
   if test "$enable_gsm_codec" = "no"; then
                 ac_no_gsm_codec=1
+                cat >>confdefs.h <<\_ACEOF
+#define PJMEDIA_HAS_GSM_CODEC 0
+_ACEOF
+
                 echo "$as_me:$LINENO: result: Checking if GSM codec is disabled...yes" >&5
 echo "${ECHO_T}Checking if GSM codec is disabled...yes" >&6
@@ -8518 +8530 @@
   if test "$enable_speex_codec" = "no"; then
                 ac_no_speex_codec=1
+                cat >>confdefs.h <<\_ACEOF
+#define PJMEDIA_HAS_SPEEX_CODEC 0
+_ACEOF
+
                 echo "$as_me:$LINENO: result: Checking if Speex codec is disabled...yes" >&5
 echo "${ECHO_T}Checking if Speex codec is disabled...yes" >&6
@@ -8532 +8548 @@
   if test "$enable_ilbc_codec" = "no"; then
                 ac_no_ilbc_codec=1
+                cat >>confdefs.h <<\_ACEOF
+#define PJMEDIA_HAS_ILBC_CODEC 0
+_ACEOF
+
                 echo "$as_me:$LINENO: result: Checking if iLBC codec is disabled...yes" >&5
 echo "${ECHO_T}Checking if iLBC codec is disabled...yes" >&6
@@ -9501 +9521 @@
   "pjlib/include/pj/compat/os_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/os_auto.h" ;;
   "pjlib/include/pj/compat/m_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/m_auto.h" ;;
+  "pjmedia/include/pjmedia/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia/config_auto.h" ;;
+  "pjmedia/include/pjmedia-codec/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia-codec/config_auto.h" ;;
   "pjsip/include/pjsip/sip_autoconf.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

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

@@ -921 +921 @@
 
     /* Must register all codecs to be supported */
+#if defined(PJMEDIA_HAS_G711_CODEC) && PJMEDIA_HAS_G711_CODEC!=0
     pjmedia_codec_g711_init(app.med_endpt);
+#endif
+#if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC!=0
     pjmedia_codec_gsm_init(app.med_endpt);
+#endif
+#if defined(PJMEDIA_HAS_SPEEX_CODEC) && PJMEDIA_HAS_SPEEX_CODEC!=0
     pjmedia_codec_speex_init(app.med_endpt, PJMEDIA_SPEEX_NO_UWB, 3, 3);
-
+#endif
 
     /* Init dummy socket addresses */