From 9481880a059d5db744ec12679ea14c10d2bf9d75 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 28 Apr 2015 12:31:32 +0800 Subject: [PATCH] configure.ac --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 71e5b3b27..0c1947cdf 100644 --- a/configure.ac +++ b/configure.ac @@ -104,8 +104,7 @@ if test $webkit_4_0_enabled = yes; then AC_DEFINE(HAVE_WEBKIT4,1,[webkit 4.0 support]) else PKG_CHECK_MODULES(WEBKIT, [webkit2gtk-3.0], - [webkit_3_0_enabled=yes], - [webkit_3_0_enabled=no]) + [webkit_3_0_enabled=yes] ) AC_DEFINE(HAVE_WEBKIT3,1,[webkit 3.0 support]) @@ -119,15 +118,13 @@ dnl -- javascriptcoregtk-4.0 ** not sure if this is needed.... PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-4.0], - [javascriptcoregtk_4_0_enabled=yes], - [javascriptcoregtk_4_0_enabled=no]) + [javascriptcoregtk_4_0_enabled=yes] ) if test $javascriptcoregtk_4_0_enabled = yes; then AC_DEFINE(HAVE_JAVASCRIPTCOREGTK4,1,[javascriptcoregtk 4.0 support]) else PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-3.0], - [javascriptcoregtk_3_0_enabled=yes], - [javascriptcoregtk_3_0_enabled=no]) + [javascriptcoregtk_3_0_enabled=yes] ) AC_DEFINE(HAVE_JAVASCRIPTCOREGTK3,1,[javascriptcoregtk 3.0 support]) @@ -148,11 +145,14 @@ if test $vte_2_91_enabled = yes; then AC_DEFINE(HAVE_VTE_2_91,1,[libvte 2.91 support]) else PKG_CHECK_MODULES(VTE, [vte-2.90], - [vte_2_90_enabled=yes]) + [vte_2_90_enabled=yes] + ) AC_DEFINE(HAVE_VTE_2_90,1,[libvte 2.90 support]) fi - +AM_CONDITIONAL(HAVE_VTE_2_90, test "$vte_2_90_enabled" = "yes") +AM_CONDITIONAL(HAVE_VTE_2_91, test "$vte_2_91_enabled" = "yes") + AC_CONFIG_FILES([ Makefile src/Makefile -- 2.39.2