Werner Lemberg
06abcbf9ba
scripted-diff: Orthogonalize string quoting
...
Add double qoutes to string tests where arguments could (theoretically)
contain spaces.
Remove double quotes where not necessary.
-BEGIN VERIFY SCRIPT-
sed -iE -e 's/"x\(yes\|no\|auto\)\?"/x\1/g' -e 's/test \(x\$[^ ]*\)/test "\1"/g' build-aux/m4/bitcoin_qt.m4
-END VERIFY SCRIPT-
7 years ago
Werner Lemberg
e0496d3b9a
bitcoin_qt.m4: Add missing dollar sign for variable.
7 years ago
Werner Lemberg
079f4b2a24
bitcoin_qt.m4: Add missing braces around variables in autoconf messages.
7 years ago
Werner Lemberg
8695315fb2
bitcoin_qt.m4: Use correct M4 quoting characters.
7 years ago
Werner Lemberg
db32a4fd6b
bitcoin_qt.m4: Improve QT_VERSION tests.
...
Use '<QtCore/qconfig.h> and '<QtCore/qglobal.h>' for testing QT_VERSION.
This makes the tests work with both Qt4 and Qt5, even if '-fPIC' or '-fPIE'
is not used (the compiler might choke otherwise if QT_REDUCE_RELOCATIONS is
active).
7 years ago
Timothy Redaelli
7222388bb2
Avoid printing generic and duplicated "checking for QT" during ./configure
...
Print "checking for QT4" and "checking for QT5" instead
8 years ago
Russell Yanofsky
bf1026412d
Run bitcoin_test-qt under minimal QPA platform
...
Fixes broken "make check" reported by Matt Corallo <git@bluematt.me> in
https://github.com/bitcoin/bitcoin/issues/10110
Fix was suggested and initially implemented by
Cory Fields <cory-nospam-@coryfields.com> in
https://github.com/bitcoin/bitcoin/pull/10117#issuecomment-290275236
8 years ago
Cory Fields
342eb9618a
build: find qt's renamed helper libs from 5.7
8 years ago
Luke Dashjr
0c4e6ce88f
Add MIT license to build-aux/m4 scripts
8 years ago
Cory Fields
0c928cb13c
build: Fix Qt5PlatformSupport check without pkg-config
...
The non-pkg-config case can't use pkg-config to check the version.
Also, make sure that the check is properly guarded in the case of missing
pkg-config macros.
9 years ago
Jonas Schnelli
2759597bc8
Only pass -lQt5PlatformSupport if >=Qt5.6
9 years ago
Jonas Schnelli
6194d9a501
Fix bitcoin_qt.m4 and fix-xcb-include-order.patch
9 years ago
Chris Moore
3d19193f14
Remove spurious dollar sign. Fixes #7189 .
9 years ago
Luke Dashjr
d5f46832de
Unify package name to as few places as possible without major changes
9 years ago
Cory Fields
69d0513436
build: Use fPIC rather than fPIE for qt objects.
...
But only if qt was built with reduced relocations.
9 years ago
Cory Fields
17c4d9d164
build: Split hardening/fPIE options out
...
This allows for fPIE to be used selectively.
9 years ago
Wladimir J. van der Laan
dbacc69b4f
build: If both Qt4 and Qt5 are installed, use Qt5
...
If both Qt4 and Qt5 development headers are installed, use Qt5. Building
against Qt5 should be encouraged as that is where active development
happens.
9 years ago
Cory Fields
31bfc272c7
build: make sure pkg-config checks are guarded by an m4_ifdef
9 years ago
Cory Fields
fe997dfd12
build: fix building against qt5.4/5.5
9 years ago
Wladimir J. van der Laan
55f55ec5db
qt: disable qt tests when one of the checks for the gui fails
10 years ago
Luke Dashjr
b77b4eda8d
Bugfix: Replace bashisms with standard sh to fix build on non-BASH systems
10 years ago
Cory Fields
9fedafba4b
build: Fix OSX build when using Homebrew and qt5
...
Qt5 is bottled, so configure won't find it without some help. Use
brew to find out its prefix.
Also, qt5 added the host_bins variable to pkg-config, use it.
10 years ago
randy-waterhouse
e2a98d270d
Update obsolete AC macros.
10 years ago
randy-waterhouse
52a5f90360
Create the common location for all m4 autotool build scripts, build-aux/m4.
...
Update .gitignore.
10 years ago
randy-waterhouse
c101c76907
build: Add --with-utils (bitcoin-cli and bitcoin-tx, default=yes).
...
Help string consistency tweaks. Target sanity check fix.
10 years ago
ntrgn
c4a77090c4
Fixes ignored qt 4.8 codecs path on windows when configuring with --with-qt-libdir
10 years ago
Cory Fields
d597219d6d
build: add --with-qt-translationdir to configure for use with static qt
10 years ago
Cory Fields
f8120f7e0f
build: Find the proper xcb/pcre dependencies
10 years ago
ntrgn
9ce0774aba
build: Fix windows configure when using --with-qt-libdir
...
fixes #4630
Github-Pull: #4633
10 years ago
Cory Fields
2d89ea9781
build: fix whitespace in pkg-config variable
...
Useful for PKG_CONFIG="pkg-config --static"
11 years ago
Cory Fields
ab123ad4d6
build: allow linux and osx to build against static qt5
...
This is the first part of a huge effort to rework the handling of dependencies.
To start, this change allows all supported platforms to build against a static
Qt. 5.2.1 and 5.3 have been successfully tested against osx64, win32, win64,
linux32, and linux64.
It also makes a small change to the windows config, to allow linking against
qt builds with or without built-in libjpeg/libpng/libpcre/libz.
The actual build processes to take advantage of these changes (for gitian and
pull-tester) are coming soon. Until then, this should be a no-op.
11 years ago
Cory Fields
56c157d5e0
build: avoid the use of top_ and abs_ dir paths
...
Using them has the side effect of confusing the dependency-tracking logic.
11 years ago
Cory Fields
a22e9a32b3
build: fix explicit --disable-qt-dbus
...
It worked in the auto/yes cases, but an explicit disable actually forced
it on.
11 years ago
Cory Fields
6986861fda
build: use -mwindows for gui targets when linking with mingw
11 years ago
Wladimir J. van der Laan
53e9d3aa44
build: fix typo in configure help message
...
--with-qt-libdir etc, not --with-gui-libdir.
The typo was introduced in a9dbcf036b
.
11 years ago
Luke Dashjr
e18e1001eb
configure: Minor grammatical changes to be more clear
11 years ago
Luke Dashjr
a9dbcf036b
configure: Change --with[out]-qt to --with[out]-gui and add --with[out]-cli and --with[out]-daemon to support more build configurations
11 years ago
Luke Dashjr
f47299038d
Bugfix: Correct captitalisation of Qt
11 years ago
Wladimir J. van der Laan
1e3abb4e3d
build: upgrade Qt used by windows build to 5.2.0
11 years ago
Wladimir J. van der Laan
67d60f7031
build: fix MacOSX build after ec41342
...
Fix regression introduced in ec41342
.
Also use a less ugly solution, by defining the value of
`MOC_DEFS` in the configure script instead of `Makefile.include`.
11 years ago
Cory Fields
42cc96737c
qt5: fix typo causing broken selection logic
11 years ago
Cory Fields
371f3f6ba5
qt5: fix --with-qt with no arguments
11 years ago
Cory Fields
c8ba8ef654
qt5: split out qt config and add qt5 support
...
Qt5 detection is a big ugly mess, but at least we can fence it off.
11 years ago