![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 3062 for pjproject/trunk
- Timestamp:
- Jan 14, 2010 2:46:54 PM (15 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 7 edited
-
aconfigure (modified) (15 diffs)
-
aconfigure.ac (modified) (4 diffs)
-
build.mak.in (modified) (2 diffs)
-
pjmedia/build/os-auto.mak.in (modified) (1 diff)
-
pjmedia/include/pjmedia-codec/config_auto.h.in (modified) (2 diffs)
-
pjmedia/src/pjmedia-codec/gsm.c (modified) (2 diffs)
-
third_party/build/os-auto.mak.in (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/aconfigure
r3059 r3062 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.64 for pjproject 1. 0.3 # Generated by GNU Autoconf 2.64 for pjproject 1.x. 4 4 # 5 5 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, … … 547 547 PACKAGE_NAME='pjproject' 548 548 PACKAGE_TARNAME='pjproject' 549 PACKAGE_VERSION='1. 0'550 PACKAGE_STRING='pjproject 1. 0'549 PACKAGE_VERSION='1.x' 550 PACKAGE_STRING='pjproject 1.x' 551 551 PACKAGE_BUGREPORT='' 552 552 PACKAGE_URL='' … … 611 611 ac_pa_use_alsa 612 612 ac_pa_cflags 613 ac_ pa_path613 ac_external_pa 614 614 ac_pjmedia_snd 615 ac_external_gsm 616 ac_external_speex 615 617 ac_os_objs 616 618 EGREP … … 684 686 enable_floating_point 685 687 enable_epoll 688 with_external_speex 689 with_external_gsm 686 690 enable_sound 687 with_ pa_path691 with_external_pa 688 692 enable_oss 689 693 enable_ext_sound … … 1256 1260 # This message is too long to be a string in the A/UX 3.1 sh. 1257 1261 cat <<_ACEOF 1258 \`configure' configures pjproject 1. 0to adapt to many kinds of systems.1262 \`configure' configures pjproject 1.x to adapt to many kinds of systems. 1259 1263 1260 1264 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1322 1326 if test -n "$ac_init_help"; then 1323 1327 case $ac_init_help in 1324 short | recursive ) echo "Configuration of pjproject 1. 0:";;1328 short | recursive ) echo "Configuration of pjproject 1.x:";; 1325 1329 esac 1326 1330 cat <<\_ACEOF … … 1361 1365 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 1362 1366 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 1363 --with-pa-path=DIR Specify PortAudio alternate location (e.g. /usr). 1364 When this option is set, we will not use our copy of 1365 PortAudio in third_party directory. 1367 --with-external-speex Use external Speex development files, not the one in 1368 "third_party" directory. When this option is set, 1369 make sure that Speex is accessible to use (hint: use 1370 CFLAGS and LDFLAGS env var to set the include/lib 1371 paths) 1372 --with-external-gsm Use external GSM codec library, not the one in 1373 "third_party" directory. When this option is set, 1374 make sure that the GSM include/lib files are 1375 accessible to use (hint: use CFLAGS and LDFLAGS env 1376 var to set the include/lib paths) 1377 --with-external-pa Use external PortAudio development files, not the 1378 one in "third_party" directory. When this option is 1379 set, make sure that PortAudio is accessible to use 1380 (hint: use CFLAGS and LDFLAGS env var to set the 1381 include/lib paths) 1366 1382 1367 1383 Some influential environment variables: … … 1443 1459 if $ac_init_version; then 1444 1460 cat <<\_ACEOF 1445 pjproject configure 1. 01461 pjproject configure 1.x 1446 1462 generated by GNU Autoconf 2.64 1447 1463 … … 1779 1795 running configure, to aid debugging if configure makes a mistake. 1780 1796 1781 It was created by pjproject $as_me 1. 0, which was1797 It was created by pjproject $as_me 1.x, which was 1782 1798 generated by GNU Autoconf 2.64. Invocation command line was 1783 1799 … … 2264 2280 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" 2265 2281 2266 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/os-auto.mak third_party/build/os-auto.mak"2282 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/os-auto.mak third_party/build/portaudio/os-auto.mak" 2267 2283 2268 2284 … … 5172 5188 5173 5189 5190 ac_external_speex=0 5191 5192 5193 # Check whether --with-external-speex was given. 5194 if test "${with_external_speex+set}" = set; then : 5195 withval=$with_external_speex; 5196 if test "x$with_external_speex" != "xno"; then 5197 # Test Speex installation 5198 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if external Speex devkit is installed" >&5 5199 $as_echo_n "checking if external Speex devkit is installed... " >&6; } 5200 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5201 /* end confdefs.h. */ 5202 #include <speex/speex.h> 5203 #include <speex/speex_echo.h> 5204 5205 int 5206 main () 5207 { 5208 speex_echo_state_init(0, 0); speex_encoder_init(0); 5209 ; 5210 return 0; 5211 } 5212 _ACEOF 5213 if ac_fn_c_try_compile "$LINENO"; then : 5214 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 5215 $as_echo "yes!!" >&6; } 5216 $as_echo "#define PJMEDIA_EXTERNAL_SPEEX_CODEC 1" >>confdefs.h 5217 5218 ac_external_speex="1" 5219 5220 else 5221 as_fn_error "Unable to use external Speex library. If Speex development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 5222 fi 5223 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 5224 fi 5225 5226 5227 fi 5228 5229 5230 ac_external_gsm=0 5231 5232 5233 # Check whether --with-external-gsm was given. 5234 if test "${with_external_gsm+set}" = set; then : 5235 withval=$with_external_gsm; 5236 if test "x$with_external_gsm" != "xno"; then 5237 # Test GSM library installation 5238 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed" >&5 5239 $as_echo_n "checking if external GSM devkit is installed... " >&6; } 5240 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5241 /* end confdefs.h. */ 5242 #include <gsm/gsm.h> 5243 5244 int 5245 main () 5246 { 5247 gsm_create(); 5248 ; 5249 return 0; 5250 } 5251 5252 _ACEOF 5253 if ac_fn_c_try_compile "$LINENO"; then : 5254 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 5255 $as_echo "yes!!" >&6; } 5256 $as_echo "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h 5257 5258 ac_external_gsm="1" 5259 5260 else 5261 as_fn_error "Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 5262 fi 5263 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 5264 fi 5265 5266 5267 fi 5268 5269 5270 5271 5174 5272 5175 5273 # Check whether --enable-sound was given. … … 5184 5282 5185 5283 5186 5187 5188 # Check whether --with-pa-path was given. 5189 if test "${with_pa_path+set}" = set; then : 5190 withval=$with_pa_path; 5191 if test "x$with_pa_path" != "xno"; then 5192 ac_pa_path=$with_pa_path 5193 # Remove trailing backslash 5194 ac_pa_path=`echo $ac_pa_path | sed 's/\/$//'` 5195 # Test the path 5196 #if test ! -f $ac_pa_path/include/portaudio.h; then 5197 # AC_MSG_ERROR([Wrong --with-pa-path value, $ac_pa_path/include/portaudio.h does not exist]) 5198 #fi 5199 #if test ! -d $ac_pa_path/lib; then 5200 # AC_MSG_ERROR([Wrong --with-pa-path value, $ac_pa_path/lib does not exist]) 5201 #fi 5202 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** Using PortAudio in $ac_pa_path **" >&5 5203 $as_echo "** Using PortAudio in $ac_pa_path **" >&6; } 5284 ac_external_pa=0 5285 5286 5287 # Check whether --with-external-pa was given. 5288 if test "${with_external_pa+set}" = set; then : 5289 withval=$with_external_pa; 5290 if test "x$with_external_pa" != "xno"; then 5291 # Test PortAudio installation 5292 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if external PortAudio devkit is installed" >&5 5293 $as_echo_n "checking if external PortAudio devkit is installed... " >&6; } 5294 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5295 /* end confdefs.h. */ 5296 #include <portaudio.h> 5297 5298 int 5299 main () 5300 { 5301 Pa_Initialize(); 5302 ; 5303 return 0; 5304 } 5305 _ACEOF 5306 if ac_fn_c_try_compile "$LINENO"; then : 5307 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 5308 $as_echo "yes!!" >&6; } 5309 ac_external_pa="1" 5310 5311 else 5312 as_fn_error "Unable to use PortAudio. If PortAudio development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 5313 fi 5314 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 5204 5315 fi 5205 5316 5206 5317 5207 5318 fi 5208 5209 5319 5210 5320 … … 6446 6556 # values after options handling. 6447 6557 ac_log=" 6448 This file was extended by pjproject $as_me 1. 0, which was6558 This file was extended by pjproject $as_me 1.x, which was 6449 6559 generated by GNU Autoconf 2.64. Invocation command line was 6450 6560 … … 6506 6616 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 6507 6617 ac_cs_version="\\ 6508 pjproject config.status 1. 06618 pjproject config.status 1.x 6509 6619 configured by $0, generated by GNU Autoconf 2.64, 6510 6620 with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" … … 6630 6740 "pjmedia/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;; 6631 6741 "pjsip/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjsip/build/os-auto.mak" ;; 6742 "third_party/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;; 6632 6743 "third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; 6633 "third_party/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;;6634 6744 6635 6745 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; -
pjproject/trunk/aconfigure.ac
r3059 r3062 1 AC_INIT(pjproject,1. 0)1 AC_INIT(pjproject,1.x) 2 2 3 3 host_orig="$host" … … 14 14 AC_CONFIG_FILES([build.mak 15 15 build/os-auto.mak 16 17 16 pjlib/build/os-auto.mak 17 pjlib-util/build/os-auto.mak 18 18 pjmedia/build/os-auto.mak 19 19 pjsip/build/os-auto.mak 20 third_party/build/os-auto.mak 20 21 third_party/build/portaudio/os-auto.mak 21 third_party/build/os-auto.mak 22 ]) 22 ]) 23 23 24 24 … … 380 380 dnl # 381 381 382 dnl # Use external Speex installation 383 AC_SUBST(ac_external_speex,0) 384 AC_ARG_WITH(external-speex, 385 AC_HELP_STRING([--with-external-speex], 386 [Use external Speex development files, not the one in "third_party" directory. When this option is set, make sure that Speex is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), 387 [ 388 if test "x$with_external_speex" != "xno"; then 389 # Test Speex installation 390 AC_MSG_CHECKING([if external Speex devkit is installed]) 391 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <speex/speex.h> 392 #include <speex/speex_echo.h> 393 ]], 394 [speex_echo_state_init(0, 0); speex_encoder_init(0); ])], 395 [AC_MSG_RESULT(yes!!) 396 AC_DEFINE(PJMEDIA_EXTERNAL_SPEEX_CODEC, 1) 397 ac_external_speex="1" 398 ], 399 [AC_MSG_ERROR([Unable to use external Speex library. If Speex development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) 400 fi 401 ] 402 ) 403 404 dnl # Use external GSM codec library installation 405 AC_SUBST(ac_external_gsm,0) 406 AC_ARG_WITH(external-gsm, 407 AC_HELP_STRING([--with-external-gsm], 408 [Use external GSM codec library, not the one in "third_party" directory. When this option is set, make sure that the GSM include/lib files are accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), 409 [ 410 if test "x$with_external_gsm" != "xno"; then 411 # Test GSM library installation 412 AC_MSG_CHECKING([if external GSM devkit is installed]) 413 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gsm/gsm.h> 414 ]], 415 [gsm_create(); ]) 416 ], 417 [AC_MSG_RESULT(yes!!) 418 AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1) 419 ac_external_gsm="1" 420 ], 421 [AC_MSG_ERROR([Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) 422 fi 423 ] 424 ) 425 426 427 382 428 dnl # Sound device backend selection 383 429 AC_SUBST(ac_pjmedia_snd) … … 391 437 ) 392 438 393 dnl # PortAudio path. If ac_pa_path is not empty, we're using PortAudio 394 dnl # in external location (not under third_party) 395 AC_SUBST(ac_pa_path) 396 AC_ARG_WITH(pa-path, 397 AC_HELP_STRING([--with-pa-path=DIR], 398 [Specify PortAudio alternate location (e.g. /usr). When this option is set, we will not use our copy of PortAudio in third_party directory.]), 439 dnl # Use external PortAudio installation 440 AC_SUBST(ac_external_pa,0) 441 AC_ARG_WITH(external-pa, 442 AC_HELP_STRING([--with-external-pa], 443 [Use external PortAudio development files, not the one in "third_party" directory. When this option is set, make sure that PortAudio is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), 399 444 [ 400 if test "x$with_pa_path" != "xno"; then 401 ac_pa_path=$with_pa_path 402 # Remove trailing backslash 403 ac_pa_path=`echo $ac_pa_path | sed 's/\/$//'` 404 # Test the path 405 #if test ! -f $ac_pa_path/include/portaudio.h; then 406 # AC_MSG_ERROR([Wrong --with-pa-path value, $ac_pa_path/include/portaudio.h does not exist]) 407 #fi 408 #if test ! -d $ac_pa_path/lib; then 409 # AC_MSG_ERROR([Wrong --with-pa-path value, $ac_pa_path/lib does not exist]) 410 #fi 411 AC_MSG_RESULT([** Using PortAudio in $ac_pa_path **]) 445 if test "x$with_external_pa" != "xno"; then 446 # Test PortAudio installation 447 AC_MSG_CHECKING([if external PortAudio devkit is installed]) 448 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <portaudio.h> 449 ]], 450 [Pa_Initialize();])], 451 [AC_MSG_RESULT(yes!!) 452 ac_external_pa="1" 453 ], 454 [AC_MSG_ERROR([Unable to use PortAudio. If PortAudio development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) 412 455 fi 413 456 ] 414 457 ) 415 416 458 417 459 AC_SUBST(ac_pa_cflags) -
pjproject/trunk/build.mak.in
r3058 r3062 15 15 16 16 ifneq (@ac_no_gsm_codec@,1) 17 ifeq (@ac_external_gsm@,1) 18 # External GSM library 19 APP_THIRD_PARTY_LIBS += -lgsm 20 APP_THIRD_PARTY_LIB_FILES += 21 else 17 22 APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME) 18 23 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX) 19 24 endif 25 endif 20 26 21 27 ifneq (@ac_no_speex_codec@,1) 28 ifeq (@ac_external_speex@,1) 29 APP_THIRD_PARTY_LIBS += -lspeex -lspeexdsp 30 APP_THIRD_PARTY_LIB_FILES += 31 else 22 32 APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME) 23 33 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX) 34 endif 24 35 endif 25 36 … … 34 45 endif 35 46 36 ifneq ( x@ac_pa_path@,x)37 # We're using external PortAudio 38 APP_THIRD_PARTY_LIBS += - L@ac_pa_path@/lib -lportaudio47 ifneq ($(findstring pa,@ac_pjmedia_snd@),) 48 ifeq (@ac_external_pa@,1) 49 APP_THIRD_PARTY_LIBS += -lportaudio 39 50 APP_THIRD_PARTY_LIB_FILES += 40 51 else 41 ifneq ($(findstring pa,@ac_pjmedia_snd@),)42 52 APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME) 43 53 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX) -
pjproject/trunk/pjmedia/build/os-auto.mak.in
r3058 r3062 87 87 # 88 88 ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) 89 ifeq (x@ac_pa_path@,x) 89 ifeq (@ac_external_pa@,1) 90 # External PA 91 export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 92 #else 90 93 # Our PA in third_party 91 94 export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 92 else93 # External PA94 export CFLAGS += -I@ac_pa_path@/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=195 95 endif 96 96 endif -
pjproject/trunk/pjmedia/include/pjmedia-codec/config_auto.h.in
r2601 r3062 43 43 #endif 44 44 45 #undef PJMEDIA_EXTERNAL_GSM_CODEC 45 46 46 47 /* Speex codec */ … … 49 50 #endif 50 51 52 #undef PJMEDIA_EXTERNAL_SPEEX_CODEC 51 53 52 54 /* iLBC codec */ -
pjproject/trunk/pjmedia/src/pjmedia-codec/gsm.c
r2760 r3062 29 29 #include <pj/string.h> 30 30 #include <pj/os.h> 31 #include "../../third_party/gsm/inc/gsm.h"32 31 33 32 /* … … 35 34 */ 36 35 #if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC != 0 36 37 #if defined(PJMEDIA_EXTERNAL_GSM_CODEC) && PJMEDIA_EXTERNAL_GSM_CODEC 38 # include <gsm/gsm.h> 39 #else 40 # include "../../third_party/gsm/inc/gsm.h" 41 #endif 37 42 38 43 /* We removed PLC in 0.6 (and re-enabled it again in 0.9!) */ -
pjproject/trunk/third_party/build/os-auto.mak.in
r3058 r3062 1 1 2 2 ifneq (@ac_no_gsm_codec@,1) 3 ifeq (@ac_external_gsm@,1) 4 # External 5 else 3 6 DIRS += gsm 7 endif 4 8 endif 5 9 … … 9 13 10 14 ifneq (@ac_no_speex_codec@,1) 15 ifeq (@ac_external_speex@,1) 16 # External speex 17 else 11 18 DIRS += speex 19 endif 12 20 endif 13 21 … … 16 24 endif 17 25 18 ifeq (x@ac_pa_path@,x)19 # Only if we're using our own PA in third_party20 26 ifneq ($(findstring pa,@ac_pjmedia_snd@),) 27 ifeq (@ac_external_pa@,1) 28 # External PA 29 else 21 30 DIRS += portaudio 22 31 endif
Note: See TracChangeset
for help on using the changeset viewer.
