← Back to branch summary

~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mto: (4.4.1 sid) (1.2.2 upstream) (16.1.1 lucid)
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: james.westby@ubuntu.com-20090515183058-35m5or0ufm5tutud
Tags: upstream-1.1.7
Import upstream version 1.1.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
2
2
 
3
3
m4_define([webkit_major_version], [1])
4
4
m4_define([webkit_minor_version], [1])
5
 
m4_define([webkit_micro_version], [6])
 
5
m4_define([webkit_micro_version], [7])
6
6
 
7
7
AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
8
8
 
24
24
 
25
25
dnl # Libtool library version, not to confuse with API version
26
26
dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
27
 
LIBWEBKITGTK_VERSION=6:0:4
 
27
LIBWEBKITGTK_VERSION=7:0:5
28
28
AC_SUBST([LIBWEBKITGTK_VERSION])
29
29
 
30
30
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
216
216
AC_SUBST(PANGO_CFLAGS)
217
217
AC_SUBST(PANGO_LIBS)
218
218
 
 
219
PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION)
 
220
AC_SUBST(ENCHANT_CFLAGS)
 
221
AC_SUBST(ENCHANT_LIBS)
 
222
 
219
223
# check for target-specific dependencies
220
224
if test "$with_target" = "directfb"; then
221
225
   PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION)
224
228
else
225
229
   PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
226
230
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
227
 
   PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION)
228
231
 
229
232
   if test "$with_target" = "x11" && test "$os_win32" = "no"; then
230
233
      # check for XT
251
254
AC_SUBST(GTK_LIBS)
252
255
AC_SUBST(CAIRO_CFLAGS)
253
256
AC_SUBST(CAIRO_LIBS)
254
 
AC_SUBST(ENCHANT_CFLAGS)
255
 
AC_SUBST(ENCHANT_LIBS)
256
257
 
257
258
# check whether to build with debugging enabled
258
259
AC_MSG_CHECKING([whether to do a debug build])
296
297
              [],[enable_channel_messaging="no"])
297
298
AC_MSG_RESULT([$enable_channel_messaging])
298
299
 
 
300
# check whether to enable JavaScript debugger/profiler support
 
301
AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support])
 
302
AC_ARG_ENABLE(javascript_debugger,
 
303
              AC_HELP_STRING([--enable-javascript-debugger],
 
304
                             [enable JavaScript debugger/profiler support [default=yes]]),
 
305
              [],[enable_javascript_debugger="yes"])
 
306
AC_MSG_RESULT([$enable_javascript_debugger])
 
307
 
299
308
# check whether to enable HTML5 Offline Web Applications support
300
309
AC_MSG_CHECKING([whether to enable HTML5 offline web applications support])
301
310
AC_ARG_ENABLE(offline_web_applications,
487
496
              [],[enable_jit="yes"])
488
497
if test "$enable_jit" = "yes"; then
489
498
    case "$target_cpu" in
490
 
        i*86)
 
499
        i*86|x86_64)
491
500
            AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
492
501
            AC_DEFINE([ENABLE_WREC], [1], [Define to enable WREC])
493
502
            AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
494
503
            AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access])
495
504
            AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic])
496
 
            AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
 
505
            case "$target_cpu" in
 
506
                i*86)
 
507
                    AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
 
508
                ;;
 
509
                x86_64)
 
510
                    AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
 
511
                    AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate])
 
512
                ;;
 
513
            esac
497
514
        ;;
498
515
        *)
499
516
            enable_jit="no (CPU '$target_cpu' not supported)"
634
651
AM_CONDITIONAL([ENABLE_DASHBOARD_SUPPORT],[test "$enable_dashboard_support" = "yes"])
635
652
AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
636
653
AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
 
654
AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
637
655
AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
638
656
AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
639
657
AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
683
701
 Dashboard support                                        : $enable_dashboard_support
684
702
 Geolocation support                                      : $enable_geolocation
685
703
 GNOME Keyring support                                    : $enable_gnomekeyring
 
704
 JavaScript debugger/profiler support                     : $enable_javascript_debugger
686
705
 HTML5 offline web applications support                   : $enable_offline_web_applications
687
706
 HTML5 channel messaging support                          : $enable_channel_messaging
688
707
 HTML5 client-side session and persistent storage support : $enable_dom_storage