From 686bb6c596c1574310b340160dfeb08df8dff81c Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Fri, 4 Jun 2021 18:26:45 +0200
Subject: when not replacing malloc with dlmalloc
 (--disable-malloc-replacement), don't build an empty libdlmalloc

* on some platforms (eg. Darwin/mac OS) we cannot apparently build empty
  convenience libraries
* instead, we use conditional subdirectories and a conditional library dependency
---
 src/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 17de739..8441456 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,8 +60,10 @@ libsciteco_base_la_SOURCES = main.c sciteco.h list.h \
 # NOTE: We cannot link in Scintilla (static library) into
 # a libtool convenience library
 libsciteco_base_la_LIBADD = $(LIBSCITECO_INTERFACE) \
-                            $(top_builddir)/contrib/dlmalloc/libdlmalloc.la \
                             $(top_builddir)/contrib/rb3ptr/librb3ptr.la
+if REPLACE_MALLOC
+libsciteco_base_la_LIBADD += $(top_builddir)/contrib/dlmalloc/libdlmalloc.la
+endif
 
 if BOOTSTRAP
 noinst_PROGRAMS = sciteco-minimal
-- 
cgit v1.2.3