diff options
| author | Glenn Morris | 2016-01-19 17:51:32 -0500 |
|---|---|---|
| committer | Glenn Morris | 2016-01-19 17:51:32 -0500 |
| commit | 1e5eb04c83420bece575cab89b028cf828aaa00e (patch) | |
| tree | 73767f073de8e1f9376b8339208118d96294cb52 | |
| parent | 2dbb4deaa97bdd89705d416b0d0cd3d3c444815f (diff) | |
| download | emacs-1e5eb04c83420bece575cab89b028cf828aaa00e.tar.gz emacs-1e5eb04c83420bece575cab89b028cf828aaa00e.zip | |
* configure.ac (WEBKIT, GIR, CAIRO): Use EMACS_CHECK_MODULES, not PKG_.
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index bf653adfae1..3b87fad60b6 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -2583,14 +2583,14 @@ then | |||
| 2583 | WEBKIT_REQUIRED=1.4.0 | 2583 | WEBKIT_REQUIRED=1.4.0 |
| 2584 | WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED" | 2584 | WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED" |
| 2585 | 2585 | ||
| 2586 | PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no) | 2586 | EMACS_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no) |
| 2587 | if test $HAVE_WEBKIT = yes; then | 2587 | if test $HAVE_WEBKIT = yes; then |
| 2588 | AC_DEFINE([HAVE_WEBKIT_OSR], 1, [Define to 1 if you have webkit_osr support.]) | 2588 | AC_DEFINE([HAVE_WEBKIT_OSR], 1, [Define to 1 if you have webkit_osr support.]) |
| 2589 | fi | 2589 | fi |
| 2590 | 2590 | ||
| 2591 | GIR_REQUIRED=1.32.1 | 2591 | GIR_REQUIRED=1.32.1 |
| 2592 | GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED" | 2592 | GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED" |
| 2593 | PKG_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no) | 2593 | EMACS_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no) |
| 2594 | if test $HAVE_GIR = yes; then | 2594 | if test $HAVE_GIR = yes; then |
| 2595 | AC_DEFINE([HAVE_GIR], 1, [Define to 1 if you have GIR support.]) | 2595 | AC_DEFINE([HAVE_GIR], 1, [Define to 1 if you have GIR support.]) |
| 2596 | fi | 2596 | fi |
| @@ -3136,7 +3136,7 @@ if test "${HAVE_X11}" = "yes"; then | |||
| 3136 | if test "${with_cairo}" != "no"; then | 3136 | if test "${with_cairo}" != "no"; then |
| 3137 | CAIRO_REQUIRED=1.12.0 | 3137 | CAIRO_REQUIRED=1.12.0 |
| 3138 | CAIRO_MODULE="cairo >= $CAIRO_REQUIRED" | 3138 | CAIRO_MODULE="cairo >= $CAIRO_REQUIRED" |
| 3139 | PKG_CHECK_MODULES(CAIRO, $CAIRO_MODULE, USE_CAIRO=yes, :) | 3139 | EMACS_CHECK_MODULES(CAIRO, $CAIRO_MODULE, USE_CAIRO=yes, :) |
| 3140 | if test $USE_CAIRO = yes; then | 3140 | if test $USE_CAIRO = yes; then |
| 3141 | AC_DEFINE(USE_CAIRO, 1, [Define to 1 if using cairo.]) | 3141 | AC_DEFINE(USE_CAIRO, 1, [Define to 1 if using cairo.]) |
| 3142 | else | 3142 | else |