From 7bd523fca9a4e86772e2c8b1a84377f64ea2d968 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 30 Mar 2020 06:15:11 +0300
Subject: Fix compilation with disabled libbacktrace

---
 3rdparty/libbacktrace/Makefile.in | 40 +++++++++++++++++++++------------------
 configure                         |  3 ++-
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/3rdparty/libbacktrace/Makefile.in b/3rdparty/libbacktrace/Makefile.in
index 3be3bc86a..edb433a4e 100644
--- a/3rdparty/libbacktrace/Makefile.in
+++ b/3rdparty/libbacktrace/Makefile.in
@@ -19,24 +19,28 @@
 
 # @configure_input@
 
-LIBBACKTRACE_OBJ = atomic.o \
-	dwarf.o \
-	fileline.o \
-	posix.o \
-	print.o \
-	sort.o \
-	state.o \
-	backtrace.o \
-	simple.o \
-	nounwind.o \
-	unknown.o \
-	read.o \
-	mmapio.o \
-	alloc.o \
-	mmap.o \
-	@LIBBACKTRACE_FORMAT_FILE@
-LIBBACKTRACE_H = backtrace.h internal.h
-
+ifeq (@USE_LIBBACKTRACE@,yes)
+	LIBBACKTRACE_OBJ = atomic.o \
+		dwarf.o \
+		fileline.o \
+		posix.o \
+		print.o \
+		sort.o \
+		state.o \
+		backtrace.o \
+		simple.o \
+		nounwind.o \
+		unknown.o \
+		read.o \
+		mmapio.o \
+		alloc.o \
+		mmap.o \
+		@LIBBACKTRACE_FORMAT_FILE@
+	LIBBACKTRACE_H = backtrace.h internal.h
+else
+	LIBBACKTRACE_OBJ =
+	LIBBACKTRACE_H =
+endif
 
 @SET_MAKE@
 
diff --git a/configure b/configure
index a1d233c57..9d65cdeb8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac aa7aba7b6.
+# From configure.ac 4cda256c4.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -633,6 +633,7 @@ MYSQL_VERSION
 HAVE_MYSQL
 MYSQL_CONFIG_HOME
 DLLEXT
+USE_LIBBACKTRACE
 BACKTRACE_USES_MALLOC
 ALLOC_FILE
 VIEW_FILE
-- 
cgit v1.2.3-70-g09d2