Changeset 909 for pjproject/trunk

Timestamp:

Jan 27, 2007 5:44:13 PM (18 years ago)

Author:

bennylp

Message:

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

Location:

pjproject/trunk

Files:

• aconfigure.ac (modified) (6 diffs)
• pjmedia/include/pjmedia-codec/config.h (modified) (2 diffs)
• pjmedia/include/pjmedia-codec/config_auto.h.in (added)
• pjmedia/include/pjmedia/config.h (modified) (2 diffs)
• pjmedia/include/pjmedia/config_auto.h.in (added)

pjproject/trunk/aconfigure.ac

@@ -8 +8 @@
 AC_CONFIG_HEADER([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
                  ])
@@ -333 +335 @@
               [if test "$enable_g711_codec" = "no"; then
                 [ac_no_g711_codec=1]
+                AC_DEFINE(PJMEDIA_HAS_G711_CODEC,0)
                 AC_MSG_RESULT([Checking if G.711 codec is disabled...yes])
                fi],
@@ -345 +348 @@
               [if test "$enable_l16_codec" = "no"; then
                 [ac_no_l16_codec=1]
+                AC_DEFINE(PJMEDIA_HAS_L16_CODEC,0)
                 AC_MSG_RESULT([Checking if L16 codecs are disabled...yes])
                fi],
@@ -357 +361 @@
               [if test "$enable_gsm_codec" = "no"; then
                 [ac_no_gsm_codec=1]
+                AC_DEFINE(PJMEDIA_HAS_GSM_CODEC,0)
                 AC_MSG_RESULT([Checking if GSM codec is disabled...yes])
                fi],
@@ -368 +373 @@
               [if test "$enable_speex_codec" = "no"; then
                 [ac_no_speex_codec=1]
+                AC_DEFINE(PJMEDIA_HAS_SPEEX_CODEC,0)
                 AC_MSG_RESULT([Checking if Speex codec is disabled...yes])
                fi],
@@ -379 +385 @@
               [if test "$enable_ilbc_codec" = "no"; then
                 [ac_no_ilbc_codec=1]
+                AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC,0)
                 AC_MSG_RESULT([Checking if iLBC codec is disabled...yes])
                fi],

pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

@@ -22 +22 @@
 #include <pjmedia/types.h>
 
+/*
+ * Include config_auto.h if autoconf is used (PJ_AUTOCONF is set)
+ */
+#if defined(PJ_AUTOCONF)
+#   include <pjmedia-codec/config_auto.h>
+#endif
 
 /**
@@ -57 +63 @@
 
 #endif  /* __PJMEDIA_CODEC_CONFIG_H__ */
+

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -37 +37 @@
  * @{
  */
+
+/*
+ * Include config_auto.h if autoconf is used (PJ_AUTOCONF is set)
+ */
+#if defined(PJ_AUTOCONF)
+#   include <pjmedia/config_auto.h>
+#endif
 
 /*
@@ -92 +99 @@
 /**
  * Unless specified otherwise, G711 codec is included by default.
- * Note that there are parts of G711 codec (such as linear2ulaw) that are 
- * needed by other PJMEDIA components (e.g. silence detector, conference).
- * Thus disabling G711 is generally not a good idea.
  */
 #ifndef PJMEDIA_HAS_G711_CODEC