comparison configure @ 1615:cc481995c96d

Fix typo in condition operator; ensure c++11 used for config checks with gcc
author Chris Cannam
date Mon, 27 Feb 2017 13:37:43 +0000
parents e5ead8c8f5ed
children e86e23110e42
comparison
equal deleted inserted replaced
1614:e5ead8c8f5ed 1615:cc481995c96d
4422 CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS" 4422 CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS"
4423 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS" 4423 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
4424 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS" 4424 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
4425 4425
4426 if test "x$GCC" = "xyes"; then 4426 if test "x$GCC" = "xyes"; then
4427 CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe" 4427 CXXFLAGS_ANY="-std=c++11 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
4428 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror" 4428 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
4429 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math" 4429 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
4430 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0" 4430 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
4431 fi 4431 fi
4432 4432
5683 5683
5684 5684
5685 # Cap'n Proto 0.5.3 is the latest release at the time of writing, but 5685 # Cap'n Proto 0.5.3 is the latest release at the time of writing, but
5686 # it lacks the expectedSizeInWordsFromPrefix function which exists in 5686 # it lacks the expectedSizeInWordsFromPrefix function which exists in
5687 # the git repo. Our check is for that specific symbol, which would 5687 # the git repo. Our check is for that specific symbol, which would
5688 # indicate a git checkout, or release 0.5.4 or later. 5688 # indicate a git clone, or for release 0.5.4 or later via pkg-config.
5689 5689
5690 pkg_failed=no 5690 pkg_failed=no
5691 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capnp" >&5 5691 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capnp" >&5
5692 $as_echo_n "checking for capnp... " >&6; } 5692 $as_echo_n "checking for capnp... " >&6; }
5693 5693
5694 if test -n "$capnp_CFLAGS"; then 5694 if test -n "$capnp_CFLAGS"; then
5695 pkg_cv_capnp_CFLAGS="$capnp_CFLAGS" 5695 pkg_cv_capnp_CFLAGS="$capnp_CFLAGS"
5696 elif test -n "$PKG_CONFIG"; then 5696 elif test -n "$PKG_CONFIG"; then
5697 if test -n "$PKG_CONFIG" && \ 5697 if test -n "$PKG_CONFIG" && \
5698 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capnp => 0.5.4\""; } >&5 5698 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capnp >= 0.5.4\""; } >&5
5699 ($PKG_CONFIG --exists --print-errors "capnp => 0.5.4") 2>&5 5699 ($PKG_CONFIG --exists --print-errors "capnp >= 0.5.4") 2>&5
5700 ac_status=$? 5700 ac_status=$?
5701 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 5701 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5702 test $ac_status = 0; }; then 5702 test $ac_status = 0; }; then
5703 pkg_cv_capnp_CFLAGS=`$PKG_CONFIG --cflags "capnp => 0.5.4" 2>/dev/null` 5703 pkg_cv_capnp_CFLAGS=`$PKG_CONFIG --cflags "capnp >= 0.5.4" 2>/dev/null`
5704 test "x$?" != "x0" && pkg_failed=yes 5704 test "x$?" != "x0" && pkg_failed=yes
5705 else 5705 else
5706 pkg_failed=yes 5706 pkg_failed=yes
5707 fi 5707 fi
5708 else 5708 else
5710 fi 5710 fi
5711 if test -n "$capnp_LIBS"; then 5711 if test -n "$capnp_LIBS"; then
5712 pkg_cv_capnp_LIBS="$capnp_LIBS" 5712 pkg_cv_capnp_LIBS="$capnp_LIBS"
5713 elif test -n "$PKG_CONFIG"; then 5713 elif test -n "$PKG_CONFIG"; then
5714 if test -n "$PKG_CONFIG" && \ 5714 if test -n "$PKG_CONFIG" && \
5715 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capnp => 0.5.4\""; } >&5 5715 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capnp >= 0.5.4\""; } >&5
5716 ($PKG_CONFIG --exists --print-errors "capnp => 0.5.4") 2>&5 5716 ($PKG_CONFIG --exists --print-errors "capnp >= 0.5.4") 2>&5
5717 ac_status=$? 5717 ac_status=$?
5718 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 5718 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5719 test $ac_status = 0; }; then 5719 test $ac_status = 0; }; then
5720 pkg_cv_capnp_LIBS=`$PKG_CONFIG --libs "capnp => 0.5.4" 2>/dev/null` 5720 pkg_cv_capnp_LIBS=`$PKG_CONFIG --libs "capnp >= 0.5.4" 2>/dev/null`
5721 test "x$?" != "x0" && pkg_failed=yes 5721 test "x$?" != "x0" && pkg_failed=yes
5722 else 5722 else
5723 pkg_failed=yes 5723 pkg_failed=yes
5724 fi 5724 fi
5725 else 5725 else
5736 _pkg_short_errors_supported=yes 5736 _pkg_short_errors_supported=yes
5737 else 5737 else
5738 _pkg_short_errors_supported=no 5738 _pkg_short_errors_supported=no
5739 fi 5739 fi
5740 if test $_pkg_short_errors_supported = yes; then 5740 if test $_pkg_short_errors_supported = yes; then
5741 capnp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "capnp => 0.5.4" 2>&1` 5741 capnp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "capnp >= 0.5.4" 2>&1`
5742 else 5742 else
5743 capnp_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "capnp => 0.5.4" 2>&1` 5743 capnp_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "capnp >= 0.5.4" 2>&1`
5744 fi 5744 fi
5745 # Put the nasty error message in config.log where it belongs 5745 # Put the nasty error message in config.log where it belongs
5746 echo "$capnp_PKG_ERRORS" >&5 5746 echo "$capnp_PKG_ERRORS" >&5
5747 5747
5748 { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&5 5748 { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&5