aboutsummaryrefslogtreecommitdiff
path: root/src/m4
diff options
context:
space:
mode:
Diffstat (limited to 'src/m4')
-rw-r--r--src/m4/bitcoin_qt.m410
1 files changed, 8 insertions, 2 deletions
diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4
index f04db33bd5..f7cb935d6d 100644
--- a/src/m4/bitcoin_qt.m4
+++ b/src/m4/bitcoin_qt.m4
@@ -1,7 +1,7 @@
dnl Helper for cases where a qt dependency is not met.
dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
AC_DEFUN([BITCOIN_QT_FAIL],[
- if test "x$bitcoin_qt_want_version" = "xauto"; then
+ if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then
if test x$bitcoin_enable_qt != xno; then
AC_MSG_WARN([$1; bitcoin-qt frontend will not be built])
fi
@@ -50,7 +50,13 @@ AC_DEFUN([BITCOIN_QT_INIT],[
AC_ARG_WITH([qt],
[AS_HELP_STRING([--with-qt],
[with qt (no|qt4|qt5|auto. default is auto, qt4 tried first.)])],
- [bitcoin_qt_want_version=$withval],
+ [
+ bitcoin_qt_want_version=$withval
+ if test x$bitcoin_qt_want_version = xyes; then
+ bitcoin_qt_force=yes
+ bitcoin_qt_want_version=auto
+ fi
+ ],
[bitcoin_qt_want_version=auto])
AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], [])