neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

configure: Change --with[out]-qt to --with[out]-gui and add --with[out]-cli and --with[out]-daemon to support more build configurations

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

20
configure.ac
View File

@ -446,8 +446,18 @@ if test x$boost_sleep != xyes; then
AC_MSG_ERROR(No working boost sleep implementation found. If on ubuntu 13.10 with libboost1.54-all-dev remove libboost.1.54-all-dev and use libboost1.53-all-dev) AC_MSG_ERROR(No working boost sleep implementation found. If on ubuntu 13.10 with libboost1.54-all-dev remove libboost.1.54-all-dev and use libboost1.53-all-dev)
fi fi
build_bitcoind=yes AC_ARG_WITH([cli],
build_bitcoin_cli=yes [AS_HELP_STRING([--with-cli],
[with CLI (default is yes)])],
[build_bitcoin_cli=$withval],
[build_bitcoin_cli=yes])
AC_ARG_WITH([daemon],
[AS_HELP_STRING([--with-daemon],
[with daemon (default is yes)])],
[build_bitcoind=$withval],
[build_bitcoind=yes])
BITCOIN_QT_INIT BITCOIN_QT_INIT
if test x$use_pkgconfig = xyes; then if test x$use_pkgconfig = xyes; then
@ -622,7 +632,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-gui.")
fi fi
fi fi
fi fi
@ -631,6 +641,10 @@ if test x$use_tests = xyes; then
BUILD_TEST="test" BUILD_TEST="test"
fi fi
if test "x$use_tests$build_bitcoind$use_qt" = "xnonono"; then
AC_MSG_ERROR([No targets! Please specify at least one of: --enable-cli --enable-daemon --enable-gui or --enable-tests])
fi
AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin]) AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows]) AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet == xyes]) AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet == xyes])

22
src/m4/bitcoin_qt.m4
View File

@ -47,9 +47,9 @@ dnl input variables are set correctly.
dnl CAUTION: Do not use this inside of a conditional. dnl CAUTION: Do not use this inside of a conditional.
AC_DEFUN([BITCOIN_QT_INIT],[ AC_DEFUN([BITCOIN_QT_INIT],[
dnl enable qt support dnl enable qt support
AC_ARG_WITH([qt], AC_ARG_WITH([gui],
[AS_HELP_STRING([--with-qt], [AS_HELP_STRING([--with-gui],
[with qt (no|qt4|qt5|auto. default is auto, qt4 tried first.)])], [with GUI (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 if test x$bitcoin_qt_want_version = xyes; then
@ -59,10 +59,10 @@ AC_DEFUN([BITCOIN_QT_INIT],[
], ],
[bitcoin_qt_want_version=auto]) [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], []) AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-gui-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], [])
AC_ARG_WITH([qt-libdir],[AS_HELP_STRING([--with-qt-libdir=LIB_DIR],[specify qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], []) AC_ARG_WITH([qt-libdir],[AS_HELP_STRING([--with-gui-libdir=LIB_DIR],[specify qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], [])
AC_ARG_WITH([qt-plugindir],[AS_HELP_STRING([--with-qt-plugindir=PLUGIN_DIR],[specify qt plugin path (overridden by pkgconfig)])], [qt_plugin_path=$withval], []) AC_ARG_WITH([qt-plugindir],[AS_HELP_STRING([--with-gui-plugindir=PLUGIN_DIR],[specify qt plugin path (overridden by pkgconfig)])], [qt_plugin_path=$withval], [])
AC_ARG_WITH([qt-bindir],[AS_HELP_STRING([--with-qt-bindir=BIN_DIR],[specify qt bin path])], [qt_bin_path=$withval], []) AC_ARG_WITH([qt-bindir],[AS_HELP_STRING([--with-gui-bindir=BIN_DIR],[specify qt bin path])], [qt_bin_path=$withval], [])
AC_ARG_WITH([qtdbus], AC_ARG_WITH([qtdbus],
[AS_HELP_STRING([--with-qtdbus], [AS_HELP_STRING([--with-qtdbus],
@ -73,7 +73,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[
dnl Find the appropriate version of Qt libraries and includes. dnl Find the appropriate version of Qt libraries and includes.
dnl Inputs: $1: Whether or not pkg-config should be used. yes|no. Default: yes. dnl Inputs: $1: Whether or not pkg-config should be used. yes|no. Default: yes.
dnl Inputs: $2: If $1 is "yes" and --with-qt=auto, which qt version should be dnl Inputs: $2: If $1 is "yes" and --with-gui=auto, which qt version should be
dnl tried first. dnl tried first.
dnl Outputs: See _BITCOIN_QT_FIND_LIBS_* dnl Outputs: See _BITCOIN_QT_FIND_LIBS_*
dnl Outputs: Sets variables for all qt-related tools. dnl Outputs: Sets variables for all qt-related tools.
@ -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 GUI 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
@ -211,7 +211,7 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[
]) ])
dnl Internal. Find Qt libraries using pkg-config. dnl Internal. Find Qt libraries using pkg-config.
dnl Inputs: bitcoin_qt_want_version (from --with-qt=). The version to check dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to check
dnl first. dnl first.
dnl Inputs: $1: If bitcoin_qt_want_version is "auto", check for this version dnl Inputs: $1: If bitcoin_qt_want_version is "auto", check for this version
dnl first. dnl first.
@ -265,7 +265,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[
dnl Internal. Find Qt libraries without using pkg-config. Version is deduced dnl Internal. Find Qt libraries without using pkg-config. Version is deduced
dnl from the discovered headers. dnl from the discovered headers.
dnl Inputs: bitcoin_qt_want_version (from --with-qt=). The version to use. dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to use.
dnl If "auto", the version will be discovered by _BITCOIN_QT_CHECK_QT5. dnl If "auto", the version will be discovered by _BITCOIN_QT_CHECK_QT5.
dnl Outputs: All necessary QT_* variables are set. dnl Outputs: All necessary QT_* variables are set.
dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5". dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5".