From 63e4dc566a6196aede47ad0ac776b9f450574f65 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Wed, 28 Nov 2018 19:57:28 +0200 Subject: [PATCH] Autotools: Replace CPPFLAGS with CXXFLAGS --- configure | 28 ++++++++++++++-------------- configure.ac | 22 +++++++++++----------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/configure b/configure index 9477b6de7..0cc216f94 100755 --- a/configure +++ b/configure @@ -4995,8 +4995,8 @@ $as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} $as_echo "#define HAVE_BOOST /**/" >>confdefs.h # execute ACTION-IF-FOUND (if present): - { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLAGS: \"$BOOST_CPPFLAGS\"" >&5 -$as_echo "$as_me: Boost CPPFLAGS: \"$BOOST_CPPFLAGS\"" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CXXFLAGS: \"$BOOST_CPPFLAGS\"" >&5 +$as_echo "$as_me: Boost CXXFLAGS: \"$BOOST_CPPFLAGS\"" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: Boost LDFLAGS: \"$BOOST_LDFLAGS\"" >&5 $as_echo "$as_me: Boost LDFLAGS: \"$BOOST_LDFLAGS\"" >&6;} fi @@ -5009,7 +5009,7 @@ fi -CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" +CXXFLAGS="$BOOST_CPPFLAGS $CXXFLAGS" LDFLAGS="$BOOST_LDFLAGS $LDFLAGS" # add workaround for problematic boost version @@ -5386,7 +5386,7 @@ else libtorrent_LIBS=$pkg_cv_libtorrent_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS" + CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS" fi @@ -5479,7 +5479,7 @@ else zlib_LIBS=$pkg_cv_zlib_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CPPFLAGS="$zlib_CFLAGS $CPPFLAGS" + CXXFLAGS="$zlib_CFLAGS $CXXFLAGS" LIBS="$zlib_LIBS $LIBS" fi @@ -5519,8 +5519,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x$QBT_CXX11_FOUND" = "xno"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports C++11" >&5 $as_echo_n "checking if compiler supports C++11... " >&6; } - TMP_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -std=c++11" + TMP_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++11" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5544,7 +5544,7 @@ $as_echo "yes" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++11 is disabled by the set compiler flags" >&5 $as_echo_n "checking if C++11 is disabled by the set compiler flags... " >&6; } # prepend the flag so it won't override conflicting user defined flags - CPPFLAGS="-std=c++11 $TMP_CPPFLAGS" + CXXFLAGS="-std=c++11 $TMP_CXXFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5565,15 +5565,15 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CPPFLAGS="$TMP_CPPFLAGS -std=c++11" + CXXFLAGS="$TMP_CXXFLAGS -std=c++11" { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++11 mode is now force enabled. Make sure you use the same C++ mode for qBittorrent and its dependencies. -To explicitly set qBittorrent to a later mode use CPPFLAGS. -Example: \`CPPFLAGS=\"\$CPPFLAGS -std=c++14\" ./configure\`" >&5 +To explicitly set qBittorrent to a later mode use CXXFLAGS. +Example: \`CXXFLAGS=\"\$CXXFLAGS -std=c++14\" ./configure\`" >&5 $as_echo "$as_me: WARNING: C++11 mode is now force enabled. Make sure you use the same C++ mode for qBittorrent and its dependencies. -To explicitly set qBittorrent to a later mode use CPPFLAGS. -Example: \`CPPFLAGS=\"\$CPPFLAGS -std=c++14\" ./configure\`" >&2;} +To explicitly set qBittorrent to a later mode use CXXFLAGS. +Example: \`CXXFLAGS=\"\$CXXFLAGS -std=c++14\" ./configure\`" >&2;} else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -5683,7 +5683,7 @@ extract() { IFS=$SAVEIFS } -extract "$CFLAGS $CXXFLAGS $CPPFLAGS" +extract "$CFLAGS $CXXFLAGS" QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES" # Substitute the values of these vars in conf.pri.in diff --git a/configure.ac b/configure.ac index 966d8a176..6fb0ec932 100644 --- a/configure.ac +++ b/configure.ac @@ -160,10 +160,10 @@ AS_CASE(["x$enable_qt_dbus"], AX_BOOST_BASE([1.35], - [AC_MSG_NOTICE([Boost CPPFLAGS: "$BOOST_CPPFLAGS"]) + [AC_MSG_NOTICE([Boost CXXFLAGS: "$BOOST_CPPFLAGS"]) AC_MSG_NOTICE([Boost LDFLAGS: "$BOOST_LDFLAGS"])], [AC_MSG_ERROR([Could not find Boost])]) -CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" +CXXFLAGS="$BOOST_CPPFLAGS $CXXFLAGS" LDFLAGS="$BOOST_LDFLAGS $LDFLAGS" # add workaround for problematic boost version @@ -192,12 +192,12 @@ AS_CASE(["x$with_qtsingleapplication"], PKG_CHECK_MODULES(libtorrent, [libtorrent-rasterbar >= 1.0.6], - [CPPFLAGS="$libtorrent_CFLAGS $CPPFLAGS" + [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS"]) PKG_CHECK_MODULES(zlib, [zlib >= 1.2.5.2], - [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS" + [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS" LIBS="$zlib_LIBS $LIBS"]) # Check if already in >= C++11 mode because of the flags returned by one of the above packages @@ -212,20 +212,20 @@ AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()], # and if yes, enable it leaving a warning to the user AS_IF([test "x$QBT_CXX11_FOUND" = "xno"], [AC_MSG_CHECKING([if compiler supports C++11]) - TMP_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -std=c++11" + TMP_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++11" AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()], [AC_MSG_RESULT([yes]) AC_MSG_CHECKING([if C++11 is disabled by the set compiler flags]) # prepend the flag so it won't override conflicting user defined flags - CPPFLAGS="-std=c++11 $TMP_CPPFLAGS" + CXXFLAGS="-std=c++11 $TMP_CXXFLAGS" AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()], [AC_MSG_RESULT([no]) - CPPFLAGS="$TMP_CPPFLAGS -std=c++11" + CXXFLAGS="$TMP_CXXFLAGS -std=c++11" AC_MSG_WARN([C++11 mode is now force enabled. Make sure you use the same C++ mode for qBittorrent and its dependencies. -To explicitly set qBittorrent to a later mode use CPPFLAGS. -Example: `CPPFLAGS="\$CPPFLAGS -std=c++14" ./configure`])], +To explicitly set qBittorrent to a later mode use CXXFLAGS. +Example: `CXXFLAGS="\$CXXFLAGS -std=c++14" ./configure`])], [AC_MSG_RESULT([yes]) AC_MSG_ERROR([The compiler supports C++11 but the user or a dependency has explicitly enabled a lower mode.])])], [AC_MSG_RESULT([no]) @@ -266,7 +266,7 @@ extract() { IFS=$SAVEIFS } -extract "$CFLAGS $CXXFLAGS $CPPFLAGS" +extract "$CFLAGS $CXXFLAGS" QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES" # Substitute the values of these vars in conf.pri.in