sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: Correct captitalisation of Qt

Browse Source
This commit is contained in:
Luke Dashjr 2014-01-18 20:04:11 +00:00
parent f930341d81
commit f47299038d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -622,7 +622,7 @@ if test x$bitcoin_enable_qt != xno; then
if test x$use_tests = xyes; then if test x$use_tests = xyes; then
BUILD_TEST_QT="test" BUILD_TEST_QT="test"
if test x$bitcoin_enable_qt_test != xyes; then if test x$bitcoin_enable_qt_test != xyes; then
AC_MSG_ERROR("QT Test lib not found. Use --disable-tests or --without-qt.") AC_MSG_ERROR("Qt Test lib not found. Use --disable-tests or --without-qt.")
fi fi
fi fi
fi fi

16
src/m4/bitcoin_qt.m4
View File

@ -22,7 +22,7 @@ AC_DEFUN([BITCOIN_QT_CHECK],[
]) ])
dnl BITCOIN_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing]) dnl BITCOIN_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing])
dnl Helper for finding the path of programs needed for QT. dnl Helper for finding the path of programs needed for Qt.
dnl Inputs: $1: Variable to be set dnl Inputs: $1: Variable to be set
dnl Inputs: $2: List of programs to search for dnl Inputs: $2: List of programs to search for
dnl Inputs: $3: Look for $2 here before $PATH dnl Inputs: $3: Look for $2 here before $PATH
@ -113,7 +113,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
dnl enable qt support dnl enable qt support
AC_MSG_CHECKING(if QT should be enabled) AC_MSG_CHECKING(if Qt should be enabled)
BITCOIN_QT_CHECK([ BITCOIN_QT_CHECK([
bitcoin_enable_qt=yes bitcoin_enable_qt=yes
bitcoin_enable_qt_test=yes bitcoin_enable_qt_test=yes
@ -149,11 +149,11 @@ dnl All macros below are internal and should _not_ be used from the main
dnl configure.ac. dnl configure.ac.
dnl ---- dnl ----
dnl Internal. Check if the included version of QT is Qt5. dnl Internal. Check if the included version of Qt is Qt5.
dnl Requires: INCLUDES must be populated as necessary. dnl Requires: INCLUDES must be populated as necessary.
dnl Output: bitcoin_cv_qt5=yes|no dnl Output: bitcoin_cv_qt5=yes|no
AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
AC_CACHE_CHECK(for QT 5, bitcoin_cv_qt5,[ AC_CACHE_CHECK(for Qt 5, bitcoin_cv_qt5,[
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <QtCore>], [#include <QtCore>],
[ [
@ -167,13 +167,13 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
bitcoin_cv_qt5=no) bitcoin_cv_qt5=no)
])]) ])])
dnl Internal. Check if the linked version of QT was built as static libs. dnl Internal. Check if the linked version of Qt was built as static libs.
dnl Requires: Qt5. This check cannot determine if Qt4 is static. dnl Requires: Qt5. This check cannot determine if Qt4 is static.
dnl Requires: INCLUDES and LIBS must be populated as necessary. dnl Requires: INCLUDES and LIBS must be populated as necessary.
dnl Output: bitcoin_cv_static_qt=yes|no dnl Output: bitcoin_cv_static_qt=yes|no
dnl Output: Defines QT_STATICPLUGIN if plugins are static. dnl Output: Defines QT_STATICPLUGIN if plugins are static.
AC_DEFUN([_BITCOIN_QT_IS_STATIC],[ AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
AC_CACHE_CHECK(for static QT, bitcoin_cv_static_qt,[ AC_CACHE_CHECK(for static Qt, bitcoin_cv_static_qt,[
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <QtCore>], [#include <QtCore>],
[ [
@ -187,7 +187,7 @@ AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
[bitcoin_cv_static_qt=no]) [bitcoin_cv_static_qt=no])
]) ])
if test xbitcoin_cv_static_qt = xyes; then if test xbitcoin_cv_static_qt = xyes; then
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static QT plugins]) AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static Qt plugins])
fi fi
]) ])
@ -197,7 +197,7 @@ dnl Inputs: $1: A series of Q_IMPORT_PLUGIN().
dnl Inputs: $2: The libraries that resolve $1. dnl Inputs: $2: The libraries that resolve $1.
dnl Output: QT_LIBS is prepended or configure exits. dnl Output: QT_LIBS is prepended or configure exits.
AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[
AC_MSG_CHECKING(for static QT plugins: $2) AC_MSG_CHECKING(for static Qt plugins: $2)
CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS" CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS"
LIBS="$2 $QT_LIBS $LIBS" LIBS="$2 $QT_LIBS $LIBS"
AC_TRY_LINK([ AC_TRY_LINK([