Browse Source

Fixes ignored qt 4.8 codecs path on windows when configuring with --with-qt-libdir

0.10
ntrgn 11 years ago
parent
commit
c4a77090c4
  1. 10
      src/m4/bitcoin_qt.m4

10
src/m4/bitcoin_qt.m4

@ -112,11 +112,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ @@ -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],[ @@ -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)

Loading…
Cancel
Save