Initial Contribution

1 files changed, 31 insertions, 56 deletions

diff --git a/configure.ac b/configure.ac
index 94f1053..0139279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,12 +110,10 @@ AC_C_VOLATILE
 AC_HEADER_STDC
 AC_HEADER_STDBOOL
 
-# pthread (not needed on Windows)
-if test "$os_win32" = "no"; then
+# pthread
 AC_CHECK_HEADERS([pthread.h],
                  AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exist]),
                  AC_MSG_ERROR([pthread support is required to build WebKit]))
-fi
 
 # libjpeg headers
 AC_CHECK_HEADERS([jpeglib.h])
@@ -141,33 +139,19 @@ AC_SUBST([ICU_CPPFLAGS])
 AC_SUBST([ICU_LIBS])
 
 # determine the GDK/GTK+ target
-AC_MSG_CHECKING([the target windowing system])
-AC_ARG_WITH(target,
-            AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@],
+AC_MSG_CHECKING([the target for WebKit GTK+])
+AC_ARG_WITH(webkit_target,
+            AC_HELP_STRING([--with-webkit-target=@<:@x11/win32/quartz/directfb@:>@],
                            [Select webkit target [default=x11]]),
-            [],[with_target="x11"])
+            [],[with_webkit_target="x11"])
 
-case "$with_target" in
+case "$with_webkit_target" in
      x11|win32|quartz|directfb) ;;
      *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;;
 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_RESULT([$with_webkit_target])
+
 
 # determine the http backend
 AC_MSG_CHECKING([the HTTP backend to use])
@@ -183,43 +167,38 @@ esac
 
 AC_MSG_RESULT([$http_backend])
 
-# minimum base dependencies
-CAIRO_REQUIRED_VERSION=1.4
-FONTCONFIG_REQUIRED_VERSION=2.4
-FREETYPE2_REQUIRED_VERSION=9.0
-LIBXML_REQUIRED_VERSION=2.6
 
-# minimum GTK+ base dependencies
+# minimum base dependencies
 GLIB_REQUIRED_VERSION=2.0
 GOBJECT_REQUIRED_VERSION=2.0
 GTHREAD_REQUIRED_VERSION=2.0
 PANGO_REQUIRED_VERSION=1.0
-GTK_REQUIRED_VERSION=2.8
+CAIRO_REQUIRED_VERSION=1.2
+FONTCONFIG_REQUIRED_VERSION=2.4
+FREETYPE2_REQUIRED_VERSION=9.0
+LIBXML_REQUIRED_VERSION=2.6
 
 # optional modules
+GTK_REQUIRED_VERSION=2.0
 LIBCURL_REQUIRED_VERSION=7.15
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
 GSTREAMER_REQUIRED_VERSION=0.10
 GNOME_VFS_REQUIRED_VERSION=2.0
 
-PKG_CHECK_MODULES([GLOBALDEPS],
+PKG_CHECK_MODULES([DEPENDENCIES],
                   [glib-2.0 >= $GLIB_REQUIRED_VERSION
                   gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
-                  gthread-2.0 >= $GTHREAD_REQUIRED_VERSION])
-AC_SUBST([GLOBALDEPS_CFLAGS])
-AC_SUBST([GLOBALDEPS_LIBS])
-
-PKG_CHECK_MODULES([WEBKITDEPS],
-                  [gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                  gthread-2.0 >= $GTHREAD_REQUIRED_VERSION
+                  gtk+-2.0 >= $GTK_REQUIRED_VERSION
                   pango >= $PANGO_REQUIRED_VERSION
                   cairo >= $CAIRO_REQUIRED_VERSION
                   cairo-ft,
                   fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                   freetype2 >= $FREETYPE2_REQUIRED_VERSION
                   libxml-2.0 >= $LIBXML_REQUIRED_VERSION])
-AC_SUBST([WEBKITDEPS_CFLAGS])
-AC_SUBST([WEBKITDEPS_LIBS])
+AC_SUBST([DEPENDENCIES_CFLAGS])
+AC_SUBST([DEPENDENCIES_LIBS])
 
 # check whether to build with debugging enabled
 AC_MSG_CHECKING([whether to do a debug build])
@@ -230,11 +209,11 @@ AC_ARG_ENABLE(debug,
 AC_MSG_RESULT([$enable_debug])
 
 # check whether to build with cross-document messaging support
-AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support])
+AC_MSG_CHECKING([whether to enable HTML5 client-side storage support])
 AC_ARG_ENABLE(cross_document_messaging,
               AC_HELP_STRING([--enable-cross-document-messaging],
-                             [enable HTML5 cross-document messaging support [default=yes]]),
-              [],[enable_cross_document_messaging="yes"])
+                             [enable HTML5 cross-document messaging support [default=no]]),
+              [],[enable_cross_document_messaging="no"])
 AC_MSG_RESULT([$enable_cross_document_messaging])
 
 # check whether to build with database support
@@ -289,7 +268,7 @@ AC_MSG_RESULT([$enable_svg_experimental])
 if test "$enable_svg_experimental" = "yes"; then
    enable_svg=yes
    enable_svg_animation=yes
-#   enable_svg_filters=yes
+   enable_svg_filters=yes
    enable_svg_fonts=yes
    enable_svg_foreign_object=yes
    enable_svg_as_image=yes
@@ -305,7 +284,7 @@ AC_ARG_ENABLE(svg,
 AC_MSG_RESULT([$enable_svg])
 
 # check whether to enable support for SVG animation
-AC_MSG_CHECKING([whether to enable support for SVG animation])
+AC_MSG_CHECKING([whether to enable support for SVG animataion])
 AC_ARG_ENABLE(svg_animation,
               AC_HELP_STRING([--enable-svg-animation],
                              [enable support for SVG animation (experimental) [default=no]]),
@@ -436,10 +415,10 @@ AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"])
 AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
 
 # target conditionals
-AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"])
-AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
-AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
-AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
+AM_CONDITIONAL([TARGET_X11], [test "$with_webkit_target" = "x11"])
+AM_CONDITIONAL([TARGET_WIN32], [test "$with_webkit_target" = "win32"])
+AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_webkit_target" = "quartz"])
+AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_webkit_target" = "directfb"])
 
 # HTTP backend conditionals
 AM_CONDITIONAL([USE_CURL], [test "$http_backend" = "curl"])
@@ -474,12 +453,11 @@ AC_OUTPUT
 echo "
 WebKit was configured with the following options:
 
-Build configuration:
- Enable debugging (slow)           : $enable_debug
- Code coverage support             : $enable_coverage
+ Target                            : $with_webkit_target
  HTTP backend                      : $http_backend
+ Enable debug                      : $enable_debug
+ Code coverage support             : $enable_coverage
  Optimized memory allocator        : $enable_fast_malloc
-Features:
  HTML5 cross-document messaging    : $enable_cross_document_messaging
  HTML5 client-side storage support : $enable_database
  HTML5 video element support       : $enable_video
@@ -493,7 +471,4 @@ Features:
  SVG use element support           : $enable_svg_use_element
  XPATH support                     : $enable_xpath
  XSLT support                      : $enable_xslt
-GTK+ configuration:
- GDK target                        : $with_target
- Hildon UI extensions              : $with_hildon
 "