[GTK] When farstream is not present do not enable MediaStream
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Aug 2012 13:45:07 +0000 (13:45 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Aug 2012 13:45:07 +0000 (13:45 +0000)
Reviewed by Philippe Normand.

When farstream libraries are no present, simply do not build MediaStream
support.

* configure.ac:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@124449 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
configure.ac

index 2e84236..1fb0078 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-08-02  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] When farstream is not present do not enable MediaStream
+
+        Reviewed by Philippe Normand.
+
+        When farstream libraries are no present, simply do not build MediaStream
+        support.
+
+        * configure.ac:
+
 2012-08-01  Jian Li  <jianli@chromium.org>
 
         Add new CSS property "-webkit-widget-region" to expose dashboard region support for other port
index 0f1c7d8..41c7dd6 100644 (file)
@@ -471,8 +471,8 @@ AC_SUBST(ENCHANT_LIBS)
 fi
 
 if test "$enable_media_stream" = "yes"; then
-   PKG_CHECK_MODULES([FARSTREAM], [farstream-0.1], [have_farstream=yes],
-                     AC_MSG_ERROR([farstream is required to enable media_stream]))
+   PKG_CHECK_MODULES([FARSTREAM], [farstream-0.1],
+                     [have_farstream=yes], [enable_media_stream=false])
    AC_SUBST([FARSTREAM_CFLAGS])
    AC_SUBST([FARSTREAM_LIBS])
 fi