diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/autotools | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/autotools')
| -rw-r--r-- | Source/autotools/webkit.m4 | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/Source/autotools/webkit.m4 b/Source/autotools/webkit.m4 index 4d8cf74..c2f2263 100644 --- a/Source/autotools/webkit.m4 +++ b/Source/autotools/webkit.m4 @@ -108,24 +108,12 @@ AC_DEFUN_ONCE([_WEBKIT_CHECK_GLIB], [dnl dnl check for glib # Version requirements -GLIB_REQUIRED_VERSION=2.24 -GOBJECT_REQUIRED_VERSION=2.0 -GTHREAD_REQUIRED_VERSION=2.0 - -PKG_CHECK_MODULES([GLIB], - [glib-2.0 >= $GLIB_REQUIRED_VERSION - gobject-2.0 >= $GOBJECT_REQUIRED_VERSION - gthread-2.0 >= $GTHREAD_REQUIRED_VERSION]) -AC_SUBST([GLIB_CFLAGS]) -AC_SUBST([GLIB_LIBS]) - -# GTK+ port only -# Check for glib-genmarshal and glib-mkenums -AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) -AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) +GLIB_REQUIRED_VERSION=2.27.90 +AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION) if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then AC_MSG_ERROR([You need the GLib dev tools in your path]) fi +GLIB_GSETTINGS ]) AC_DEFUN_ONCE([_WEBKIT_CHECK_UNICODE], |