Changeset 1201 for pjproject/branches/split-3rd-party/aconfigure

Timestamp:

Apr 17, 2007 4:16:01 PM (18 years ago)

Author:

bennylp

Message:

Fixed build system for third_party

File:

• pjproject/branches/split-3rd-party/aconfigure (modified) (4 diffs)

pjproject/branches/split-3rd-party/aconfigure

@@ -860 +860 @@
   --disable-small-filter  Exclude small filter in resampling
   --disable-large-filter  Exclude large filter in resampling
-  --disable-g711-plc      Exclude G.711 Annex A PLC
   --disable-speex-aec     Exclude Speex Acoustic Echo Canceller/AEC
   --disable-g711-codec    Exclude G.711 codecs from the build
@@ -1441 +1440 @@
                                                   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 third_party/build/portaudio/Makefile"
+                                                                                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 third_party/Makefile third_party/build/portaudio/Makefile"
 
 
@@ -9015 +9014 @@
 fi;
 
-
-# Check whether --enable-g711-plc or --disable-g711-plc was given.
-if test "${enable_g711_plc+set}" = set; then
-  enableval="$enable_g711_plc"
-  if test "$enable_g711_plc" = "no"; then
-                ac_no_g711_plc='-DPJMEDIA_HAS_G711_PLC=0'
-                echo "$as_me:$LINENO: result: Checking if G.711 Annex A PLC is disabled...yes" >&5
-echo "${ECHO_T}Checking if G.711 Annex A PLC is disabled...yes" >&6
-               fi
-else
-  echo "$as_me:$LINENO: result: Checking if G.711 Annex A PLC is disabled...no" >&5
-echo "${ECHO_T}Checking if G.711 Annex A PLC is disabled...no" >&6
-fi;
+ac_no_g711_plc=yes
+
 
 
@@ -10094 +10082 @@
   "pjmedia/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;
   "pjsip/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjsip/build/os-auto.mak" ;;
+  "third_party/Makefile" ) CONFIG_FILES="$CONFIG_FILES third_party/Makefile" ;;
   "third_party/build/portaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/Makefile" ;;
   "pjlib/include/pj/compat/os_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/os_auto.h" ;;