diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-13 11:29:32 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-13 11:30:06 +0100 |
| commit | a7973c9b6b6c72bca2e6e90aed08553bf708938d (patch) | |
| tree | ce3949df7b1b72084e334e1464e75c5be681ac4c | |
| parent | be2fb2d603476d7490279cf6db034adf1dee6dd3 (diff) | |
| parent | 67d60f703140c92825c1439d8988fcab1a350bcd (diff) | |
Merge pull request #3524
67d60f7 build: fix MacOSX build after ec41342 (Wladimir J. van der Laan)
| -rw-r--r-- | src/Makefile.include | 1 | ||||
| -rw-r--r-- | src/m4/bitcoin_qt.m4 | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.include b/src/Makefile.include index 070902c519..b9e6c262ca 100644 --- a/src/Makefile.include +++ b/src/Makefile.include @@ -12,7 +12,6 @@ LIBBITCOIN_CLI=$(top_builddir)/src/libbitcoin_cli.a LIBLEVELDB=$(top_builddir)/src/leveldb/libleveldb.a LIBMEMENV=$(top_builddir)/src/leveldb/libmemenv.a LIBBITCOINQT=$(top_builddir)/src/qt/libbitcoinqt.a -MOC_DEFS=$(DEFS) -I$(top_srcdir)/src $(LIBBITCOIN): $(MAKE) -C $(top_builddir)/src $(@F) diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4 index 91c399eef0..4ae6e4159f 100644 --- a/src/m4/bitcoin_qt.m4 +++ b/src/m4/bitcoin_qt.m4 @@ -100,13 +100,13 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt${bitcoin_qt_got_major_vers} lrelease${bitcoin_qt_got_major_vers} lrelease], $qt_bin_path) BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt${bitcoin_qt_got_major_vers} lupdate${bitcoin_qt_got_major_vers} lupdate],$qt_bin_path, yes) + MOC_DEFS='-DHAVE_CONFIG_H -I$(top_srcdir)/src' case $host in *darwin*) BITCOIN_QT_CHECK([ - MOC_DEFS="-DQ_OS_MAC" + MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC" base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit" AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)]) - AC_SUBST(MOC_DEFS) ]) ;; esac @@ -142,6 +142,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ AC_SUBST(QT_TEST_INCLUDES) AC_SUBST(QT_TEST_LIBS) AC_SUBST(QT_SELECT, qt${bitcoin_qt_got_major_vers}) + AC_SUBST(MOC_DEFS) ]) dnl All macros below are internal and should _not_ be used from the main |