[Libreoffice-commits] core.git: configure.ac

[Luboš Luňák]

 configure.ac |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7e83b2d3b52fda5c1535e85f76c096c3ee627b1e
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Sat Jun 2 20:50:36 2018 +0200

    avoid configure warning about <codecvt> not usable by preprocessor
    
    Change-Id: I710579f343eab38f576311bd15d931e5521105b2

diff --git a/configure.ac b/configure.ac
index 09cadec75714..b52bba7332c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9689,8 +9689,8 @@ else
     else
         SYSTEM_LIBNUMBERTEXT=
         AC_LANG_PUSH([C++])
-        save_CXXFLAGS=$CXXFLAGS
-        CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
+        save_CPPFLAGS=$CPPFLAGS
+        CPPFLAGS="$CPPFLAGS $CXXFLAGS_CXX11"
         AC_CHECK_HEADERS([codecvt regex])
         AS_IF([test "x$ac_cv_header_codecvt" != xyes -o "x$ac_cv_header_regex" != xyes],
                 [ ENABLE_LIBNUMBERTEXT=''
@@ -9698,7 +9698,7 @@ else
                   AC_MSG_WARN([No system-provided libnumbertext or codecvt/regex C++11 headers (min. libstdc++ 4.9).
                                Enable libnumbertext fallback (missing number to number name conversion).])
                 ])
-        CXXFLAGS=$save_CXXFLAGS
+        CPPFLAGS=$save_CPPFLAGS
         AC_LANG_POP([C++])
     fi
     if test "$ENABLE_LIBNUMBERTEXT" = TRUE; then