Another unreviewed build fix for Mac.
[WebKit-https.git] / configure.ac
index 7b365f0..300d8c9 100644 (file)
@@ -281,7 +281,7 @@ AC_MSG_RESULT([$with_gtk])
 
 GTK2_REQUIRED_VERSION=2.10
 GAIL2_REQUIRED_VERSION=1.8
-GTK3_REQUIRED_VERSION=3.0
+GTK3_REQUIRED_VERSION=3.4.0
 GAIL3_REQUIRED_VERSION=3.0
 
 case "$with_gtk" in
@@ -326,26 +326,11 @@ esac
 
 AC_MSG_RESULT([$with_target])
 
-AC_MSG_CHECKING([for Hildon UI extensions])
-AC_ARG_WITH(hildon,
-            AC_HELP_STRING([--with-hildon],
-                           [Use Hildon UI extensions [default=no]]),
-            [],[with_hildon="no"])
-AC_MSG_RESULT([$with_hildon])
-
-if test "$with_hildon" = "yes"; then
-    HILDON_CPPFLAGS="-DMAEMO_CHANGES"
-    PKG_CHECK_MODULES([HILDON], [hildon-1])
-    AC_SUBST([HILDON_CPPFLAGS])
-    AC_SUBST([HILDON_CFLAGS])
-    AC_SUBST([HILDON_LIBS])
-fi
-
 AC_MSG_CHECKING([the GStreamer version to use])
 AC_ARG_WITH([gstreamer],
-        [AS_HELP_STRING([--with-gstreamer=0.10|0.11], [the GStreamer version to use (default: 0.10)])],
+        [AS_HELP_STRING([--with-gstreamer=0.10|1.0], [the GStreamer version to use (default: 0.10)])],
         [case "$with_gstreamer" in
-        0.10|0.11) ;;
+        0.10|1.0) ;;
         *) AC_MSG_ERROR([invalid GStreamer version specified]) ;;
         esac],
         [with_gstreamer=0.10])
@@ -353,31 +338,31 @@ AC_MSG_RESULT([$with_gstreamer])
 
 GSTREAMER_0_10_REQUIRED_VERSION=0.10
 GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION=0.10.30
-GSTREAMER_0_11_REQUIRED_VERSION=0.11
-GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION=0.11.0.2
+GSTREAMER_1_0_REQUIRED_VERSION=1.0
+GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION=0.11.90
 
 case "$with_gstreamer" in
      0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION
            GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
            GST_API_VERSION=0.10
            ;;
-     0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION
-           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
-           GST_API_VERSION=0.11
+     1.0) GSTREAMER_REQUIRED_VERSION=GSTREAMER_1_0_REQUIRED_VERSION
+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION
+           GST_API_VERSION=1.0
            ;;
 esac
 
 AC_SUBST([GST_API_VERSION])
-if test "$GST_API_VERSION" = "0.11"; then
+if test "$GST_API_VERSION" = "1.0"; then
 AC_DEFINE([GST_USE_UNSTABLE_API], [1], [Using unstable GStreamer API])
-AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 0.11])
+AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 1.0])
 fi
 
 # minimum base dependencies
 CAIRO_REQUIRED_VERSION=1.10
 FONTCONFIG_REQUIRED_VERSION=2.4
 FREETYPE2_REQUIRED_VERSION=9.0
-GLIB_REQUIRED_VERSION=2.31.8
+GLIB_REQUIRED_VERSION=2.32.0
 LIBSOUP_REQUIRED_VERSION=2.37.92
 LIBXML_REQUIRED_VERSION=2.6
 PANGO_REQUIRED_VERSION=1.21.0
@@ -1199,18 +1184,18 @@ fi
 
 # check if gstreamer is available
 if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then
-   PKG_CHECK_MODULES([GSTREAMER],
-                     [gstreamer-$GST_API_VERSION >= $GSTREAMER_REQUIRED_VERSION
-                     gstreamer-app-$GST_API_VERSION
-                     gstreamer-audio-$GST_API_VERSION
-                     gstreamer-fft-$GST_API_VERSION
-                     gstreamer-base-$GST_API_VERSION
-                     gstreamer-interfaces-$GST_API_VERSION
-                     gstreamer-pbutils-$GST_API_VERSION
-                     gstreamer-plugins-base-$GST_API_VERSION >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
-                     gstreamer-video-$GST_API_VERSION],
-                     [have_gstreamer=yes])
-
+    gstreamer_modules="gstreamer-$GST_API_VERSION >= $GSTREAMER_REQUIRED_VERSION
+                       gstreamer-app-$GST_API_VERSION
+                       gstreamer-audio-$GST_API_VERSION
+                       gstreamer-fft-$GST_API_VERSION
+                       gstreamer-base-$GST_API_VERSION
+                       gstreamer-pbutils-$GST_API_VERSION
+                       gstreamer-plugins-base-$GST_API_VERSION >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
+                       gstreamer-video-$GST_API_VERSION";
+   if test "$GST_API_VERSION" != "1.0"; then
+       gstreamer_modules="$gstreamer_modules gstreamer-interfaces-$GST_API_VERSION";
+   fi
+   PKG_CHECK_MODULES([GSTREAMER], [$gstreamer_modules], [have_gstreamer=yes])
    AC_SUBST([GSTREAMER_CFLAGS])
    AC_SUBST([GSTREAMER_LIBS])
 fi
@@ -1253,8 +1238,8 @@ fi
 # WebKit2
 AC_MSG_CHECKING([whether to build Webkit2])
 AC_ARG_ENABLE(webkit2,
-    AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=no]]),
-    [], [enable_webkit2="no"])
+    AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=yes]]),
+    [], [enable_webkit2="yes"])
 AC_MSG_RESULT([$enable_webkit2])
 if test "$enable_webkit2" = "yes"; then
    if test "$GTK_API_VERSION" = "2.0"; then
@@ -1499,7 +1484,6 @@ Features:
 GTK+ configuration:
  GTK+ version                                             : $with_gtk
  GDK target                                               : $with_target
- Hildon UI extensions                                     : $with_hildon
  GStreamer version                                        : $with_gstreamer
  Introspection support                                    : $enable_introspection
  Generate documentation                                   : $enable_gtk_doc