diff options
| author | Gregory Maxwell <greg@xiph.org> | 2013-09-10 17:51:05 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2013-09-10 17:51:05 -0700 |
| commit | 11a79680b174ec39d462925ea565a23aa8c147ad (patch) | |
| tree | 6b38ba89eb3110af8a9c93a49ed141da2eeaef63 /configure.ac | |
| parent | 85311c1ef8b438a93ecf04c100e877fb49634a90 (diff) | |
| parent | 1e9d3b1392b604fafc6802e4d43469f519d14424 (diff) | |
Merge pull request #2979 from luke-jr/autoconf
Autoconf fixes
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index dde2d2eb98..066134a6f5 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,7 @@ dnl Checks for programs. AC_PROG_CXX AC_PROG_CC AC_PROG_CPP +AC_PROG_CXXCPP AC_PROG_INSTALL AC_PROG_OBJC m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX]) @@ -142,10 +143,10 @@ AC_PATH_PROG(LCOV, lcov) AC_PATH_PROG(JAVA, java) AC_PATH_PROG(GENHTML, genhtml) AC_PATH_PROG([GIT], [git]) -AC_PATH_PROGS([MOC], [moc moc-qt4],, $qt_bin_path:$PATH) -AC_PATH_PROGS([UIC], [uic uic-qt4],, $qt_bin_path:$PATH) -AC_PATH_PROG([RCC], [rcc],, $qt_bin_path:$PATH) -AC_PATH_PROG([LRELEASE], [lrelease],, $qt_bin_path:$PATH) +AC_PATH_PROGS([MOC], [moc-qt4 moc4 moc],, $qt_bin_path:$PATH) +AC_PATH_PROGS([UIC], [uic-qt4 uic4 uic],, $qt_bin_path:$PATH) +AC_PATH_PROGS([RCC], [rcc-qt4 rcc4 rcc],, $qt_bin_path:$PATH) +AC_PATH_PROGS([LRELEASE], [lrelease-qt4 lrelease4 lrelease],, $qt_bin_path:$PATH) AC_PATH_PROG([PROTOC], [protoc],, $protoc_bin_path:$PATH) AC_PATH_PROG(CCACHE,ccache) PKG_PROG_PKG_CONFIG @@ -334,8 +335,7 @@ AC_TRY_COMPILE([#include <sys/socket.h>], ) dnl Check for libdb_cxx -AC_CHECK_HEADER([db_cxx.h],,AC_MSG_ERROR(libdb_cxx headers missing)) -AC_CHECK_LIB([db_cxx], [main],, AC_MSG_ERROR(libdb_cxx missing)) +BITCOIN_FIND_BDB48 dnl Check for libminiupnpc (optional) if test x$use_upnp != xno; then |