Reviewed by Darin.

[WebKit-https.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3552613..136b871 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,9 +9,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h])
 LIBWEBKITGTK_VERSION=1:0:0
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
-AM_INIT_AUTOMAKE([1.9 subdir-objects foreign tar-ustar])
-
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 AC_CANONICAL_HOST
 
@@ -48,11 +46,11 @@ if test -z "$CFLAGS"; then
 fi
 
 # programs
+AC_DISABLE_STATIC
 AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 AM_PROG_CC_STDC
 AC_PROG_CXX
-AC_PROG_CXX_C_O
 AM_PROG_CC_C_O
 
 AC_PATH_PROG(PERL, perl)
@@ -183,8 +181,8 @@ AC_MSG_RESULT([$enable_debug])
 AC_MSG_CHECKING([whether to enable HTML5 client-side storage support])
 AC_ARG_ENABLE(database,
               AC_HELP_STRING([--enable-database],
-                             [enable HTML5 client-side storage support [default=no]]),
-              [],[enable_database="no"])
+                             [enable HTML5 client-side storage support [default=yes]]),
+              [],[enable_database="yes"])
 AC_MSG_RESULT([$enable_database])
 
 # check whether to build with icon database support
@@ -207,16 +205,16 @@ AC_MSG_RESULT([$enable_video])
 AC_MSG_CHECKING([whether to enable XPath support])
 AC_ARG_ENABLE(xpath,
               AC_HELP_STRING([--enable-xpath],
-                             [enable support for XPath [default=no]]),
-              [],[enable_xpath="no"])
+                             [enable support for XPath [default=yes]]),
+              [],[enable_xpath="yes"])
 AC_MSG_RESULT([$enable_xpath])
 
 # check whether to enable XSLT support
 AC_MSG_CHECKING([whether to enable XSLT support])
 AC_ARG_ENABLE(xslt,
               AC_HELP_STRING([--enable-xslt],
-                             [enable support for XSLT [default=no]]),
-              [],[enable_xslt="no"])
+                             [enable support for XSLT [default=yes]]),
+              [],[enable_xslt="yes"])
 AC_MSG_RESULT([$enable_xslt])
 
 # check whether to enable SVG support
@@ -231,7 +229,7 @@ AC_MSG_RESULT([$enable_svg])
 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 feature (experimental) [default=no]]),
+                             [enable support for SVG animation (experimental) [default=no]]),
               [],[enable_svg_animation="no"])
 AC_MSG_RESULT([$enable_svg_animation])
 
@@ -368,9 +366,10 @@ WebKit was configured with the following options:
 
  Target                            : $with_webkit_target
  Enable debug                      : $enable_debug
- Icon database support             : $enable_icon_database
+ Code coverage support             : $enable_coverage
  HTML5 client-side storage support : $enable_database
  HTML5 video element support       : $enable_video
+ Icon database support             : $enable_icon_database
  SVG support                       : $enable_svg
  SVG animation support             : $enable_svg_animation
  SVG filters support               : $enable_svg_filters
@@ -379,5 +378,4 @@ WebKit was configured with the following options:
  SVG use element support           : $enable_svg_use_element
  XPATH support                     : $enable_xpath
  XSLT support                      : $enable_xslt
- Code coverage support             : $enable_coverage
 "