From 7d5fd5fcd02564226abb067b0a47da637ca653fc Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 17 Oct 2016 21:51:21 +0100
Subject: Preserve existing AM_CPPFLAGS and AM_LDFLAGS values.

---
 Makefile.am  | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6d1bceb5..b56e9280 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ dist-hook:
 	grep "^#found_debug=" configure
 
 # Preprocessor flags.
-AM_CPPFLAGS = @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\""
+AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\""
 
 # glibc as usual does things ass-backwards and hides useful things by default,
 # so everyone has to add this.
diff --git a/configure.ac b/configure.ac
index 4cc5fcfc..f7a2008d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_ARG_ENABLE(
 )
 if test "x$enable_static" = xyes; then
 	test "x$PKG_CONFIG" != x && PKG_CONFIG="$PKG_CONFIG --static"
-	AM_LDFLAGS="-static"
+	AM_LDFLAGS="$AM_LDFLAGS -static"
 fi
 
 # Is this gcc?
-- 
cgit