[Libreoffice-commits] core.git: config_host.mk.in configure.ac

[Stephan Bergmann]

 config_host.mk.in |    1 -
 configure.ac      |    3 ---
 2 files changed, 4 deletions(-)

New commits:
commit 78a2e5b5c59c2f3a3e117a098dbbcf518fba2e85
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 23 10:09:37 2017 +0100

    HAVE_GCC_PRAGMA_OPERATOR is only needed as AC_DEFINE
    
    Change-Id: I1f1978bbc8c38a7d5504fb86b8a716cbbc01c830

diff --git a/config_host.mk.in b/config_host.mk.in
index 71362a4..1dfca59 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -246,7 +246,6 @@ export HAVE_GCC_FNO_INLINE=@HAVE_GCC_FNO_INLINE@
 export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@
 export HAVE_GCC_GGDB2=@HAVE_GCC_GGDB2@
 export HAVE_GCC_OG=@HAVE_GCC_OG@
-export HAVE_GCC_PRAGMA_OPERATOR=@HAVE_GCC_PRAGMA_OPERATOR@
 export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
diff --git a/configure.ac b/configure.ac
index 7408f7b..7c33f19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6319,7 +6319,6 @@ if test "$cxx11_utf16_string_literal" = yes; then
     AC_DEFINE([HAVE_CXX11_UTF16_STRING_LITERAL])
 fi
 
-HAVE_GCC_PRAGMA_OPERATOR=
 dnl _Pragma support (may require C++11)
 if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
     AC_MSG_CHECKING([whether $CXX supports _Pragma operator])
@@ -6330,13 +6329,11 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
             _Pragma("GCC diagnostic ignored \"-Wformat\"")
         ])], [
             AC_DEFINE([HAVE_GCC_PRAGMA_OPERATOR],[1])
-            HAVE_GCC_PRAGMA_OPERATOR=1
             AC_MSG_RESULT([yes])
         ], [AC_MSG_RESULT([no])])
     AC_LANG_POP([C++])
     CXXFLAGS=$save_CXXFLAGS
 fi
-AC_SUBST(HAVE_GCC_PRAGMA_OPERATOR)
 
 HAVE_GCC_FNO_SIZED_DEALLOCATION=
 if test "$GCC" = yes; then