Ignore:
Timestamp:
May 17, 2012 11:23:41 AM (10 years ago)
Author:
nanang
Message:

Close #1500:

  • Added configure options to disable video.
  • Fixed exporting env var PKG_CONFIG_PATH for pkg_config(.py) script (didn't work on MacOS).
File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r4108 r4131  
    724724with_external_pa 
    725725enable_oss 
     726enable_video 
    726727enable_ext_sound 
    727728enable_small_filter 
     
    13811382  --disable-sound         Exclude sound (i.e. use null sound) 
    13821383  --disable-oss           Disable OSS audio (default: not disabled) 
     1384  --disable-video         Disable video feature 
    13831385  --enable-ext-sound      PJMEDIA will not provide any sound device backend 
    13841386  --disable-small-filter  Exclude small filter in resampling 
     
    56725674 
    56735675 
     5676 
     5677# Check whether --enable-video was given. 
     5678if test "${enable_video+set}" = set; then : 
     5679  enableval=$enable_video; if test "$enable_video" = "no"; then 
     5680                #AC_DEFINE(PJMEDIA_HAS_VIDEO,0) 
     5681                { $as_echo "$as_me:${as_lineno-$LINENO}: result: Video is disabled" >&5 
     5682$as_echo "Video is disabled" >&6; } 
     5683                enable_sdl="no" 
     5684                enable_ffmpeg="no" 
     5685                enable_v4l2="no" 
     5686               fi 
     5687fi 
     5688 
     5689 
     5690case $target in 
     5691 arm-apple-darwin*) 
     5692        LIBS="$LIBS -framework UIKit" 
     5693        ;; 
     5694 *darwin*) 
     5695        LIBS="$LIBS -framework Foundation -framework AppKit" 
     5696        ;; 
     5697esac 
     5698 
    56745699if test "$enable_video" = "no"; then 
    56755700  true; 
     
    56815706 
    56825707        SAVED_LIBS="$LIBS" 
    5683         LIBS="-framework AVFoundation -framework UIKit -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
     5708        LIBS="-framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
    56845709        cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    56855710/* end confdefs.h.  */ 
     
    57035728        if test "$ac_pjmedia_video_has_ios" = "yes"; then 
    57045729          ac_ios_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS=1" 
    5705           LIBS="$LIBS -framework AVFoundation -framework UIKit -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
     5730          LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
    57065731          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... yes" >&5 
    57075732$as_echo "Checking if AVFoundation framework is available... yes" >&6; } 
     
    57385763        if test "$ac_pjmedia_video_has_qt" = "yes"; then 
    57395764          ac_qt_cflags="-DPJMEDIA_VIDEO_DEV_HAS_QT=1" 
    5740           LIBS="$LIBS -framework QTKit -framework Foundation -framework AppKit -framework QuartzCore -framework OpenGL" 
     5765          LIBS="$LIBS -framework QTKit -framework QuartzCore -framework OpenGL" 
    57415766          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... yes" >&5 
    57425767$as_echo "Checking if QTKit framework is available... yes" >&6; } 
     
    60526077                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5 
    60536078$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; } 
    6054                         PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig 
     6079                        export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig 
    60556080                fi 
    60566081 
     
    64106435 
    64116436                LIBS="$LIBS $ac_ffmpeg_ldflags" 
    6412                 PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH 
     6437                export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH 
    64136438 
    64146439 
Note: See TracChangeset for help on using the changeset viewer.