diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-09-18 05:18:21 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-09-18 05:18:21 -0700 |
| commit | 87d7a0ee1051dd770d57f2c5dfa6f3bcd09ee886 (patch) | |
| tree | 391a090050947bdbc1f144f0a4424bb9e94956ef | |
| parent | 9a4a7d3c6a6413b952dde12c899cf74a3fab8452 (diff) | |
| parent | 8bd6d19a92ce7da70446f419697c7a60ea9470fe (diff) | |
Merge pull request #3011 from jgarzik/autoconf
configure.ac: remove debug/release concept, prefer autotools default CXXFLAGS
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index b47185dcfa..98006cdd61 100644 --- a/configure.ac +++ b/configure.ac @@ -21,10 +21,6 @@ AH_BOTTOM([#endif //BITCOIN_CONFIG_H]) # probably be removed when building on <= 10.6 is no longer supported. m4_include([pkg.m4]) -dnl reset CXXFLAGS if empty (autoconf adds its own defaults otherwise) -: ${CFLAGS=""} -: ${CXXFLAGS=""} - dnl faketime breaks configure and is only needed for make. Disable it here. unset FAKETIME @@ -67,13 +63,6 @@ AC_ARG_WITH([qt], [use_qt=$withval], [use_qt=yes]) -dnl compile with full warnings and debugging symbols -AC_ARG_ENABLE(debug, - AS_HELP_STRING([--enable-debug],[compile with debug symbols (default is yes)]), - [use_debug=$enableval], - [use_debug=yes]) - AC_MSG_CHECKING([if compiling with debugging symbols]) - AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[compile tests (default is yes)]), [use_tests=$enableval], @@ -159,8 +148,6 @@ PKG_PROG_PKG_CONFIG ## CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter" CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO" -DEBUG_CXXFLAGS="-g -ggdb" -RELEASE_CXXFLAGS="-O2" AC_LANG_PUSH([C++]) @@ -228,9 +215,9 @@ case $host in AX_CHECK_LINK_FLAG([[$base_frameworks]],[LIBS="$LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)]) fi - AX_CHECK_COMPILE_FLAG([-mmacosx-version-min=10.5],[RELEASE_CXXFLAGS="$RELEASE_CXXFLAGS -mmacosx-version-min=10.5"]) - AX_CHECK_COMPILE_FLAG([-arch i386],[RELEASE_CXXFLAGS="$RELEASE_CXXFLAGS -arch i386"]) - RELEASE_CXXFLAGS="$RELEASE_CXXFLAGS -O3" + AX_CHECK_COMPILE_FLAG([-mmacosx-version-min=10.5],[CXXFLAGS="$CXXFLAGS -mmacosx-version-min=10.5"]) + AX_CHECK_COMPILE_FLAG([-arch i386],[CXXFLAGS="$CXXFLAGS -arch i386"]) + CXXFLAGS="$CXXFLAGS -O3" CPPFLAGS="$CPPFLAGS -DMAC_OSX" TESTDEFS="-DBOOST_TEST_DYN_LINK" ;; @@ -239,12 +226,6 @@ case $host in ;; esac -if test x$use_debug == xyes; then - CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS" -else - CXXFLAGS="$RELEASE_CXXFLAGS $CXXFLAGS" -fi - if test x$use_comparison_tool != xno; then AC_SUBST(JAVA_COMPARISON_TOOL, $use_comparison_tool) fi |