diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-01-10 16:28:57 -0500 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-01-10 16:30:33 -0500 |
| commit | 371f3f6ba553dbc99c3bd2788c2ba38882112bef (patch) | |
| tree | 1db424f11db78d8a2dbb0cd72430288f77fb37b8 /src/m4 | |
| parent | 2691cbc4b3c97a468b23f2c11dbe992dfb3f8bcb (diff) | |
qt5: fix --with-qt with no arguments
Diffstat (limited to 'src/m4')
| -rw-r--r-- | src/m4/bitcoin_qt.m4 | 10 |
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], []) |