Changeset 5347 for pjproject/trunk/aconfigure

Timestamp:

Jun 16, 2016 10:38:34 AM (8 years ago)

Author:

ming

Message:

Re #1931: Add support for AVFoundation on Mac

• Deprecate QTKit
• Rename ios_dev.m to darwin_dev.m
• Important: Re-run configure and make dep after applying this change!

File:

• pjproject/trunk/aconfigure (modified) (5 diffs)

pjproject/trunk/aconfigure

@@ -670 +670 @@
 ac_qt_cflags
 ac_pjmedia_video_has_qt
-ac_ios_cflags
-ac_pjmedia_video_has_ios
+ac_darwin_cflags
+ac_pjmedia_video_has_ios_opengl
+ac_pjmedia_video_has_darwin
 ac_android_cflags
 ac_pjmedia_video_has_android
@@ -6279 +6280 @@
         ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1"
         ;;
-  *-apple-darwin_ios*)
-        ac_pjmedia_video=iphone_os
+  *darwin*)
+        ac_pjmedia_video=darwin_os
+
 
 
@@ -6297 +6299 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_pjmedia_video_has_ios=yes
-else
-  ac_pjmedia_video_has_ios=no
+  ac_pjmedia_video_has_darwin=yes
+else
+  ac_pjmedia_video_has_darwin=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        LIBS="-framework OpenGLES"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_pjmedia_video_has_ios_opengl=yes
+else
+  ac_pjmedia_video_has_ios_opengl=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
         LIBS="$SAVED_LIBS"
-        if test "$ac_pjmedia_video_has_ios" = "yes"; then
-          ac_ios_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS=1 -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1"
-          LIBS="$LIBS -framework OpenGLES -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia"
+        if test "$ac_pjmedia_video_has_darwin" = "yes"; then
+          ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_DARWIN=1"
+          LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia"
           { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... yes" >&5
 $as_echo "Checking if AVFoundation framework is available... yes" >&6; }
@@ -6313 +6334 @@
 $as_echo "Checking if AVFoundation framework is available... no" >&6; }
         fi
-        ;;
-  *darwin*)
-        ac_pjmedia_video=mac_os
-
-
-        SAVED_LIBS="$LIBS"
-        LIBS="-framework QTKit"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then
+          ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1"
+          LIBS="$LIBS -framework OpenGLES"
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... yes" >&5
+$as_echo "Checking if OpenGLES framework is available... yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... no" >&5
+$as_echo "Checking if OpenGLES framework is available... no" >&6; }
+        fi
+        if false; then
+          # QTKit is deprecated, see ticket #1931.
+          ac_pjmedia_video=mac_os
+
+
+          SAVED_LIBS="$LIBS"
+          LIBS="-framework QTKit"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6338 +6368 @@
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LIBS="$SAVED_LIBS"
-        if test "$ac_pjmedia_video_has_qt" = "yes"; then
-          ac_qt_cflags="-DPJMEDIA_VIDEO_DEV_HAS_QT=1"
-          LIBS="$LIBS -framework QTKit -framework QuartzCore -framework OpenGL"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... yes" >&5
+          LIBS="$SAVED_LIBS"
+          if test "$ac_pjmedia_video_has_qt" = "yes"; then
+            ac_qt_cflags="-DPJMEDIA_VIDEO_DEV_HAS_QT=1"
+            LIBS="$LIBS -framework QTKit -framework QuartzCore -framework OpenGL"
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... yes" >&5
 $as_echo "Checking if QTKit framework is available... yes" >&6; }
-        else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... no" >&5
+          else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... no" >&5
 $as_echo "Checking if QTKit framework is available... no" >&6; }
-        fi
-        ;;
+          fi
+        fi
+        ;;
  esac
 fi