diff options
| author | ntrgn <ntrgnt@gmail.com> | 2014-08-07 20:02:35 +0200 |
|---|---|---|
| committer | ntrgn <ntrgnt@gmail.com> | 2014-08-07 20:02:35 +0200 |
| commit | c4a77090c4b5a8346f3d312be41c1ee50830a21a (patch) | |
| tree | e298ce1405853d097345b53dc998de44267729af | |
| parent | 003bbd5f7672d7fd4f40478fd57cc4e03c30f933 (diff) | |
| download | bitcoin-c4a77090c4b5a8346f3d312be41c1ee50830a21a.tar.xz | |
Fixes ignored qt 4.8 codecs path on windows when configuring with --with-qt-libdir
| -rw-r--r-- | src/m4/bitcoin_qt.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4 index 4c1d40c394..fa5c990cf7 100644 --- a/src/m4/bitcoin_qt.m4 +++ b/src/m4/bitcoin_qt.m4 @@ -112,11 +112,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) if test x$qt_plugin_path != x; then QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible" - if test x$bitcoin_qt_got_major_vers == x5; then - QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms" - else - QT_LIBS="$QT_LIBS -L$qt_plugin_path/codecs" - fi + QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms" fi if test x$use_pkgconfig = xyes; then PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"]) @@ -141,6 +137,10 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ else if test x$TARGET_OS == xwindows; then AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) + if test x$qt_plugin_path != x; then + QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible" + QT_LIBS="$QT_LIBS -L$qt_plugin_path/codecs" + fi _BITCOIN_QT_CHECK_STATIC_PLUGINS([ Q_IMPORT_PLUGIN(qcncodecs) Q_IMPORT_PLUGIN(qjpcodecs) |