pidgin: 320d1e01: WebKit is only required when building Pi...
qulogic at pidgin.im
qulogic at pidgin.im
Thu Sep 8 04:21:45 EDT 2011
----------------------------------------------------------------------
Revision: 320d1e01b3cedcb51048d5d0a3c396212600c824
Parent: bb41d065e7ff1100b5eb50335111df9b50537753
Author: qulogic at pidgin.im
Date: 09/08/11 01:13:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/320d1e01b3cedcb51048d5d0a3c396212600c824
Changelog:
WebKit is only required when building Pidgin.
Changes against parent bb41d065e7ff1100b5eb50335111df9b50537753
patched configure.ac
-------------- next part --------------
============================================================
--- configure.ac b6cd13129d8a770046568e2201c78d1733a3c046
+++ configure.ac d38bb3ae9958d839a8fbf93c669355a399c584e0
@@ -434,6 +434,16 @@ running configure.
PKG_CHECK_MODULES(PANGO, [pango >= 1.4.0],
AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:)
+ PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= 1.1.1], , [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([
+You must have WebKit 1.1.1 or newer development headers installed to compile
+Pidgin. If you want to build only Finch then specify --disable-gtkui when
+running configure.
+])])
+ AC_SUBST(WEBKIT_CFLAGS)
+ AC_SUBST(WEBKIT_LIBS)
+
dnl #######################################################################
dnl # Check if we should compile with X support
dnl #######################################################################
@@ -710,8 +720,6 @@ AM_CONDITIONAL(ENABLE_GNT, test "x$enabl
#AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])])
-PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= 1.1.1]);
-
dnl #######################################################################
dnl # Check for LibXML2 (required)
dnl #######################################################################
More information about the Commits
mailing list