From 2a1c27f7d49e5065d4af598848bb3810bcf65e93 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 28 Nov 2016 15:20:34 -0300
Subject: Include debug symbols in non-debug builds, disable stripping by
 default

With this commit, the difference between debug and non-debug builds is
mainly the optimization level and -DDEBUG (which isn't used much)

In other words:

    --debug=0 == CFLAGS="-g -O2 -fno-strict-aliasing"
    --debug=1 == CFLAGS="-g3 -DDEBUG -O0"

And --strip=1 can be used to get rid of the debug symbols.

This is closer to the default behavior of autotools.

Should have done this forever ago, like back when bitlbee had bugs (lol)
---
 Makefile  | 2 +-
 configure | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3d930f97..2c6c69ff 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ $(objects): Makefile Makefile.settings config.h
 $(OUTFILE): $(objects) $(subdirs)
 	@echo '*' Linking $(OUTFILE)
 	@$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
-ifndef DEBUG
+ifneq ($(firstword $(STRIP)), \#)
 	@echo '*' Stripping $(OUTFILE)
 	@-$(STRIP) $(OUTFILE)
 endif
diff --git a/configure b/configure
index 280408ee..1daaf26d 100755
--- a/configure
+++ b/configure
@@ -40,7 +40,7 @@ purple=0
 
 doc=1
 debug=0
-strip=1
+strip=0
 gcov=0
 asan=0
 plugins=1
@@ -286,7 +286,7 @@ if [ "$debug" = "1" ]; then
 	echo 'DEBUG=1' >> Makefile.settings
 	CFLAGS="$CFLAGS -g3 -DDEBUG -O0"
 else
-	[ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
+	[ -z "$CFLAGS" ] && CFLAGS="-g -O2 -fno-strict-aliasing"
 fi
 
 if [ "$pie" = "1" ]; then
-- 
cgit v1.2.3