Changeset 33926 in webkit


Ignore:
Timestamp:
May 20, 2008 4:52:08 AM (16 years ago)
Author:
jmalonzo@webkit.org
Message:

2008-05-20 Jan Michael Alonzo <​jmalonzo@webkit.org>

Reviewed by Alp.

​http://bugs.webkit.org/show_bug.cgi?id=18483
[Gtk] Autotools should match build-webkit default flags

  • configure.ac:
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r33584 r33926  
     12008-05-20  Jan Michael Alonzo  <jmalonzo@webkit.org>
     2
     3        Reviewed by Alp.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=18483
     6        [Gtk] Autotools should match build-webkit default flags
     7
     8        * configure.ac:
     9
    1102008-05-19  Alp Toker  <alp@nuanti.com>
    211

  • trunk/configure.ac

    r33584 r33926  
    284284AC_ARG_ENABLE(dom_storage,
    285285              AC_HELP_STRING([--enable-dom-storage],
    286                              [enable HTML5 client-side session and persistent storage support [default=no]]),
    287               [],[enable_dom_storage="no"])
     286                             [enable HTML5 client-side session and persistent storage support [default=yes]]),
     287              [],[enable_dom_storage="yes"])
    288288AC_MSG_RESULT([$enable_dom_storage])
    289289
    … …  
    300300AC_ARG_ENABLE(icon_database,
    301301              AC_HELP_STRING([--enable-icon-database],
    302                              [enable icon database [default=no]]),
    303               [],[enable_icon_database="no"])
     302                             [enable icon database [default=yes]]),
     303              [],[enable_icon_database="yes"])
    304304AC_MSG_RESULT([$enable_icon_database])
    305305
    … …  
    337337AC_MSG_RESULT([$enable_svg_experimental])
    338338
    339 if test "$enable_svg_experimental" = "yes"; then
     339# check whether to enable SVG support
     340AC_MSG_CHECKING([whether to enable SVG support])
     341AC_ARG_ENABLE(svg,
     342              AC_HELP_STRING([--enable-svg],
     343                             [enable support for SVG [default=yes]]),
     344              [],[enable_svg="yes"])
     345AC_MSG_RESULT([$enable_svg])
     346
     347# check for SVG features, enabling SVG if necessary
     348if test "$enable_svg_experimental" = "no" || test "$enable_svg" = "no"; then
     349   enable_svg_animation=no
     350   enable_svg_filters=no
     351   enable_svg_fonts=no
     352   enable_svg_foreign_object=no
     353   enable_svg_as_image=no
     354   enable_svg_use_element=no
     355elif test "$enable_svg_experimental" = "yes"; then
    340356   enable_svg=yes
    341357   enable_svg_animation=yes
    … …  
    347363fi
    348364
    349 # check whether to enable SVG support
    350 AC_MSG_CHECKING([whether to enable SVG support])
    351 AC_ARG_ENABLE(svg,
    352               AC_HELP_STRING([--enable-svg],
    353                              [enable support for SVG [default=no]]),
    354               [],[enable_svg="no"])
    355 AC_MSG_RESULT([$enable_svg])
    356 
    357365# check whether to enable support for SVG animation
    358366AC_MSG_CHECKING([whether to enable support for SVG animation])
    359367AC_ARG_ENABLE(svg_animation,
    360368              AC_HELP_STRING([--enable-svg-animation],
    361                              [enable support for SVG animation (experimental) [default=no]]),
    362               [],[enable_svg_animation="no"])
     369                             [enable support for SVG animation (experimental) [default=yes]]),
     370              [],[enable_svg_animation="yes"])
    363371AC_MSG_RESULT([$enable_svg_animation])
    364372
    … …  
    375383AC_ARG_ENABLE(svg_fonts,
    376384              AC_HELP_STRING([--enable-svg-fonts],
    377                              [enable support for SVG fonts (experimental) [default=no]]),
    378               [],[enable_svg_fonts="no"])
     385                             [enable support for SVG fonts (experimental) [default=yes]]),
     386              [],[enable_svg_fonts="yes"])
    379387AC_MSG_RESULT([$enable_svg_fonts])
    380388
    … …  
    383391AC_ARG_ENABLE(svg_foreign_object,
    384392              AC_HELP_STRING([--enable-svg-foreign-object],
    385                              [enable support for SVG foreign objects (experimental) [default=no]]),
    386               [],[enable_svg_foreign_object="no"])
     393                             [enable support for SVG foreign objects (experimental) [default=yes]]),
     394              [],[enable_svg_foreign_object="yes"])
    387395AC_MSG_RESULT([$enable_svg_foreign_object])
    388396
    … …  
    391399AC_ARG_ENABLE(svg_as_image,
    392400              AC_HELP_STRING([--enable-svg-as-image],
    393                              [enable SVG as Image support (experimental) [default=no]]),
    394               [],[enable_svg_as_image="no"])
     401                             [enable SVG as Image support (experimental) [default=yes]]),
     402              [],[enable_svg_as_image="yes"])
    395403AC_MSG_RESULT([$enable_svg_as_image])
    396404
    … …  
    399407AC_ARG_ENABLE(svg_use_element,
    400408              AC_HELP_STRING([--enable-svg-use-element],
    401                              [enable SVG use element support (experimental) [default=no]]),
    402               [],[enable_svg_use_element="no"])
     409                             [enable SVG use element support (experimental) [default=yes]]),
     410              [],[enable_svg_use_element="yes"])
    403411AC_MSG_RESULT([$enable_svg_use_element])
    404412
    405 # check whether to enable code coverage
    406 AC_MSG_CHECKING([whether to enable code coverage support])
    407 AC_ARG_ENABLE(coverage,
    408               AC_HELP_STRING([--enable-coverage],
    409                              [enable code coverage support [default=no]]),
    410               [],[enable_coverage="no"])
    411 AC_MSG_RESULT([$enable_coverage])
    412 
    413 # check whether to enable FastMalloc
    414 AC_MSG_CHECKING([whether to enable optimized memory allocator])
    415 AC_ARG_ENABLE(fast_malloc,
    416               AC_HELP_STRING([--enable-fast-malloc],
    417                              [enable optimized memory allocator default=yes, default=no for debug builds]),
    418               [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi])
    419 AC_MSG_RESULT([$enable_fast_malloc])
    420 
    421 # determine the font backend
    422 AC_MSG_CHECKING([the font backend to use])
    423 AC_ARG_WITH(font_backend,
    424             AC_HELP_STRING([--with-font-backend=@<:@freetype/pango@:>@],
    425                            [Select font backend [default=freetype]]),
    426             [],[with_font_backend="freetype"])
    427 
    428 case "$with_font_backend" in
    429      freetype|pango) ;;
    430      *) AC_MSG_ERROR([Invalid font backend: must be freetype or pango.]) ;;
    431 esac
    432 AC_MSG_RESULT([$with_font_backend])
    433 
    434 # Add '-g' flag to gcc if it's debug build
    435 if test "$enable_debug" = "yes"; then
    436    CXXFLAGS="$CXXFLAGS -g"
    437    CFLAGS="$CFLAGS -g"
    438 fi
    439 
    440 # check if curl is available
    441 if test "$with_http_backend" = "curl"; then
    442    PKG_CHECK_MODULES([LIBCURL],
    443                      [libcurl >= $LIBCURL_REQUIRED_VERSION])
    444    AC_SUBST([LIBCURL_CFLAGS])
    445    AC_SUBST([LIBCURL_LIBS])
    446 fi
    447 
    448 if test "$with_http_backend" = "soup"; then
    449    PKG_CHECK_MODULES([LIBSOUP],
    450                      [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
    451    AC_SUBST([LIBSOUP_CFLAGS])
    452    AC_SUBST([LIBSOUP_LIBS])
    453 fi
    454 
    455 # check if FreeType/FontConfig are available
    456 if test "$with_font_backend" = "freetype"; then
    457    PKG_CHECK_MODULES([FREETYPE],
    458                      [cairo-ft
    459                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
    460                      freetype2 >= $FREETYPE2_REQUIRED_VERSION])
    461    AC_SUBST([FREETYPE_CFLAGS])
    462    AC_SUBST([FREETYPE_LIBS])
    463 fi
    464 
    465 # check if sqlite 3 is available
    466 if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then
    467    PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION])
    468    AC_SUBST([SQLITE3_CFLAGS])
    469    AC_SUBST([SQLITE3_LIBS])
    470 fi
    471 
    472 # check if libxslt is available
    473 if test "$enable_xslt" = "yes"; then
    474    PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION])
    475    AC_SUBST([LIBXSLT_CFLAGS])
    476    AC_SUBST([LIBXSLT_LIBS])
    477 fi
    478 
    479 # check if gstreamer is available
    480 if test "$enable_video" = "yes"; then
    481    PKG_CHECK_MODULES([GSTREAMER],
    482                      [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
    483                      gstreamer-base-0.10,
    484                      gstreamer-plugins-base-0.10,
    485                      gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION])
    486    AC_SUBST([GSTREAMER_CFLAGS])
    487    AC_SUBST([GSTREAMER_LIBS])
    488 fi
    489 
    490 # check for code coverage support
    491 if test "$enable_coverage" = "yes"; then
    492    COVERAGE_CFLAGS="-MD"
    493    COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
    494    AC_SUBST([COVERAGE_CFLAGS])
    495    AC_SUBST([COVERAGE_LDFLAGS])
    496 fi
    497 
    498 # check for HTML features
    499 if test "$enable_video" = "yes"; then
    500     html_flags=yes
    501 fi
    502 
    503 # check for SVG features, enabling SVG if necessary
    504413if test "$enable_svg_animation" = "yes" || \
    505414   test "$enable_svg_filters" = "yes" || \
    … …  
    513422       enable_svg=yes
    514423   fi
     424fi
     425
     426# check whether to enable code coverage
     427AC_MSG_CHECKING([whether to enable code coverage support])
     428AC_ARG_ENABLE(coverage,
     429              AC_HELP_STRING([--enable-coverage],
     430                             [enable code coverage support [default=no]]),
     431              [],[enable_coverage="no"])
     432AC_MSG_RESULT([$enable_coverage])
     433
     434# check whether to enable FastMalloc
     435AC_MSG_CHECKING([whether to enable optimized memory allocator])
     436AC_ARG_ENABLE(fast_malloc,
     437              AC_HELP_STRING([--enable-fast-malloc],
     438                             [enable optimized memory allocator default=yes, default=no for debug builds]),
     439              [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi])
     440AC_MSG_RESULT([$enable_fast_malloc])
     441
     442# determine the font backend
     443AC_MSG_CHECKING([the font backend to use])
     444AC_ARG_WITH(font_backend,
     445            AC_HELP_STRING([--with-font-backend=@<:@freetype/pango@:>@],
     446                           [Select font backend [default=freetype]]),
     447            [],[with_font_backend="freetype"])
     448
     449case "$with_font_backend" in
     450     freetype|pango) ;;
     451     *) AC_MSG_ERROR([Invalid font backend: must be freetype or pango.]) ;;
     452esac
     453AC_MSG_RESULT([$with_font_backend])
     454
     455# Add '-g' flag to gcc if it's debug build
     456if test "$enable_debug" = "yes"; then
     457   CXXFLAGS="$CXXFLAGS -g"
     458   CFLAGS="$CFLAGS -g"
     459fi
     460
     461# check if curl is available
     462if test "$with_http_backend" = "curl"; then
     463   PKG_CHECK_MODULES([LIBCURL],
     464                     [libcurl >= $LIBCURL_REQUIRED_VERSION])
     465   AC_SUBST([LIBCURL_CFLAGS])
     466   AC_SUBST([LIBCURL_LIBS])
     467fi
     468
     469if test "$with_http_backend" = "soup"; then
     470   PKG_CHECK_MODULES([LIBSOUP],
     471                     [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
     472   AC_SUBST([LIBSOUP_CFLAGS])
     473   AC_SUBST([LIBSOUP_LIBS])
     474fi
     475
     476# check if FreeType/FontConfig are available
     477if test "$with_font_backend" = "freetype"; then
     478   PKG_CHECK_MODULES([FREETYPE],
     479                     [cairo-ft
     480                     fontconfig >= $FONTCONFIG_REQUIRED_VERSION
     481                     freetype2 >= $FREETYPE2_REQUIRED_VERSION])
     482   AC_SUBST([FREETYPE_CFLAGS])
     483   AC_SUBST([FREETYPE_LIBS])
     484fi
     485
     486# check if sqlite 3 is available
     487if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then
     488   PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION])
     489   AC_SUBST([SQLITE3_CFLAGS])
     490   AC_SUBST([SQLITE3_LIBS])
     491fi
     492
     493# check if libxslt is available
     494if test "$enable_xslt" = "yes"; then
     495   PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION])
     496   AC_SUBST([LIBXSLT_CFLAGS])
     497   AC_SUBST([LIBXSLT_LIBS])
     498fi
     499
     500# check if gstreamer is available
     501if test "$enable_video" = "yes"; then
     502   PKG_CHECK_MODULES([GSTREAMER],
     503                     [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
     504                     gstreamer-base-0.10,
     505                     gstreamer-plugins-base-0.10,
     506                     gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION])
     507   AC_SUBST([GSTREAMER_CFLAGS])
     508   AC_SUBST([GSTREAMER_LIBS])
     509fi
     510
     511# check for code coverage support
     512if test "$enable_coverage" = "yes"; then
     513   COVERAGE_CFLAGS="-MD"
     514   COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
     515   AC_SUBST([COVERAGE_CFLAGS])
     516   AC_SUBST([COVERAGE_LDFLAGS])
     517fi
     518
     519# check for HTML features
     520if test "$enable_video" = "yes"; then
     521    html_flags=yes
    515522fi
    516523
Note: See TracChangeset for help on using the changeset viewer.