BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autogen.sh: Also warn if AX_CXX_COMPILE_STDCXX_11 is not available. 

This fixes an error message when the file is not installed at all:

  ./autogen.sh: 67: [: Illegal number:

Turn the AX_CXX_COMPILE_STDCXX_11 errors into warnings though, since
it is (and should be) possible to build libsigrok (just the C library)
just fine, even without that macro or with an older version of it.
This commit is contained in:
Uwe Hermann 2014-11-15 00:41:10 +01:00
parent ff50ad701e
commit baa0c2ae67
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autogen.sh
View File

@ -55,15 +55,19 @@ echo "Generating build system..."
${LIBTOOLIZE} --install --copy --quiet || exit 1 ${LIBTOOLIZE} --install --copy --quiet || exit 1
aclocal ${ACLOCAL_DIR} || exit 1 aclocal ${ACLOCAL_DIR} || exit 1
# check the version of a specific autoconf macro that tends to cause problems # Check the version of a specific autoconf macro that tends to cause problems.
CXXMACROVERSION=$( CXXMACROVERSION=$(
grep -B 5 'm4_define(\[_AX_CXX_COMPILE_STDCXX_11_testbody\]' aclocal.m4 | grep -B 5 'm4_define(\[_AX_CXX_COMPILE_STDCXX_11_testbody\]' aclocal.m4 |
sed -nr 's/.*serial[[:space:]]+([[:digit:]]+).*/\1/p' sed -nr 's/.*serial[[:space:]]+([[:digit:]]+).*/\1/p'
) )
if [ "$CXXMACROVERSION" -lt 4 ]; then if [ "x$CXXMACROVERSION" = "x" ]; then
echo "error: the AX_CXX_COMPILE_STDCXX_11 macro on this system is too old." echo "--- Warning: AX_CXX_COMPILE_STDCXX_11 macro not found."
echo "(found version $CXXMACROVERSION, at least 4 is required)" echo "--- You won't be able to build the language bindings!"
exit 1 fi
if [ "x$CXXMACROVERSION" != "x" ] && [ "$CXXMACROVERSION" -lt 4 ]; then
echo "--- Warning: AX_CXX_COMPILE_STDCXX_11 macro is too old."
echo "--- (found version $CXXMACROVERSION, at least 4 is required)"
echo "--- You won't be able to build the language bindings!"
fi fi
autoheader || exit 1 autoheader || exit 1