[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 1e5eb04 3/3: * configure.ac (WEBKIT, GIR, CAIRO):
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-25 1e5eb04 3/3: * configure.ac (WEBKIT, GIR, CAIRO): Use EMACS_CHECK_MODULES, not PKG_. |
Date: |
Tue, 19 Jan 2016 22:51:56 +0000 |
branch: emacs-25
commit 1e5eb04c83420bece575cab89b028cf828aaa00e
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* configure.ac (WEBKIT, GIR, CAIRO): Use EMACS_CHECK_MODULES, not PKG_.
---
configure.ac | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index bf653ad..3b87fad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2583,14 +2583,14 @@ then
WEBKIT_REQUIRED=1.4.0
WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED"
- PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+ EMACS_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
if test $HAVE_WEBKIT = yes; then
AC_DEFINE([HAVE_WEBKIT_OSR], 1, [Define to 1 if you have webkit_osr
support.])
fi
GIR_REQUIRED=1.32.1
GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED"
- PKG_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no)
+ EMACS_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no)
if test $HAVE_GIR = yes; then
AC_DEFINE([HAVE_GIR], 1, [Define to 1 if you have GIR support.])
fi
@@ -3136,7 +3136,7 @@ if test "${HAVE_X11}" = "yes"; then
if test "${with_cairo}" != "no"; then
CAIRO_REQUIRED=1.12.0
CAIRO_MODULE="cairo >= $CAIRO_REQUIRED"
- PKG_CHECK_MODULES(CAIRO, $CAIRO_MODULE, USE_CAIRO=yes, :)
+ EMACS_CHECK_MODULES(CAIRO, $CAIRO_MODULE, USE_CAIRO=yes, :)
if test $USE_CAIRO = yes; then
AC_DEFINE(USE_CAIRO, 1, [Define to 1 if using cairo.])
else
- [Emacs-diffs] emacs-25 updated (11a0300 -> 1e5eb04), Glenn Morris, 2016/01/19
- [Emacs-diffs] emacs-25 644e2fb 1/3: * configure.ac (HAVE_WEBKIT_OSR): Remove broken, duplicated gtk3 test., Glenn Morris, 2016/01/19
- [Emacs-diffs] emacs-25 2dbb4de 2/3: * configure.ac (emacs_config_features): Add XWIDGETS, WEBKIT, GIR., Glenn Morris, 2016/01/19
- [Emacs-diffs] emacs-25 1e5eb04 3/3: * configure.ac (WEBKIT, GIR, CAIRO): Use EMACS_CHECK_MODULES, not PKG_.,
Glenn Morris <=