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

[Michael Stahl]

 config_host.mk.in       |    1 -
 configure.ac            |    4 ----
 solenv/gbuild/gbuild.mk |    4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit f9b665d9694a8e328379c1b0b4a714edddf4285a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 7 17:09:30 2017 +0200

    configure: remove ENABLE_CRASHDUMP placeholder
    
    It's called ENABLE_BREAKPAD now.
    
    Change-Id: I757c4da415fb895d7cc24f13e201329111246367

diff --git a/config_host.mk.in b/config_host.mk.in
index 8b7c7cfbf5cb..da45e1426271 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -114,7 +114,6 @@ export SYSTEM_COINMP=@SYSTEM_COINMP@
 export COINMP_CFLAGS=@COINMP_CFLAGS@
 export COINMP_LIBS=@COINMP_LIBS@
 export ENABLE_COLLADA=@ENABLE_COLLADA@
-export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_CURL=@ENABLE_CURL@
 export ENABLE_FUZZERS=@ENABLE_FUZZERS@
diff --git a/configure.ac b/configure.ac
index 522a1aada2c8..22dc6e90ba0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4587,10 +4587,6 @@ dnl Check for syslog header
 dnl ===================================================================
 AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H))
 
-# placeholder for future crash reporter feature
-ENABLE_CRASHDUMP=""
-AC_SUBST(ENABLE_CRASHDUMP)
-
 dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to turn warnings to errors])
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 46d0761e7316..31183b012ac4 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -115,8 +115,8 @@ ENABLE_DEBUGINFO_FOR := all
 endif
 endif
 
-# note: ENABLE_CRASHDUMP turns on gb_SYMBOL
-ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
+# note: ENABLE_BREAKPAD turns on gb_SYMBOL
+ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_BREAKPAD)),)
 gb_SYMBOL := $(true)
 else
 gb_SYMBOL := $(false)