Ignore:
Timestamp:
May 17, 2010 1:07:39 PM (12 years ago)
Author:
ming
Message:

Merge #1050, #1052, #1053, #1054 into the main trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/aconfigure

    r3158 r3175  
    22842284ac_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" 
    22852285 
    2286 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" 
     2286ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-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" 
    22872287 
    22882288 
     
    33273327 
    33283328 
     3329if test "$AR" = ""; then AR="$(CROSS_COMPILE)ar rv"; fi 
     3330 
     3331if test "$LD" = ""; then LD="$CC"; fi 
     3332 
     3333if test "$LDOUT" = ""; then LDOUT="-o"; fi 
     3334 
     3335if test "$RANLIB" = ""; then RANLIB="$(CROSSCOMPILE)ranlib"; fi 
     3336 
     3337if test "$OBJEXT" = ""; then OBJEXT='o'; fi 
     3338 
     3339if test "$LIBEXT" = ""; then LIBEXT='a'; fi 
     3340 
     3341if test "$LIBEXT2" = ""; then LIBEXT2=""; fi 
     3342 
     3343if test "$CC_OUT" = ""; then CC_OUT="-o"; fi 
     3344 
     3345if test "$CC_INC" = ""; then CC_INC="-I"; fi 
     3346 
     3347if test "$CC_DEF" = ""; then CC_DEF="-D"; fi 
     3348 
     3349if test "$CC_OPTIMIZE" = ""; then CC_OPTIMIZE="-O2"; fi 
     3350 
     3351if test "$CC_CFLAGS" = ""; then CC_CFLAGS="-Wall"; fi 
     3352 
     3353 
     3354 
     3355 
    33293356 
    33303357 
     
    53855412else 
    53865413 case $target in 
     5414  arm-apple-darwin*) 
     5415        LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox" 
     5416        { echo "$as_me:$LINENO: result: Checking sound device backend... AudioUnit" >&5 
     5417echo "${ECHO_T}Checking sound device backend... AudioUnit" >&6; } 
     5418        ;; 
    53875419  *darwin*) 
    53885420        LIBS="$LIBS -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox" 
     
    68516883    "build.mak") CONFIG_FILES="$CONFIG_FILES build.mak" ;; 
    68526884    "build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;; 
     6885    "build/cc-auto.mak") CONFIG_FILES="$CONFIG_FILES build/cc-auto.mak" ;; 
    68536886    "pjlib/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;; 
    68546887    "pjlib-util/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;; 
Note: See TracChangeset for help on using the changeset viewer.