From 706d9a73e4bd53af694a47ef24eaa832ecdfc843 Mon Sep 17 00:00:00 2001 From: rofl0r Date: Fri, 12 Jun 2015 18:28:29 +0100 Subject: [PATCH] properly deal with user-supplied CFLAGS --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 5d6924e..d46df1a 100755 --- a/configure +++ b/configure @@ -155,8 +155,9 @@ add_config "includedir = $includedir" add_config "sysconfdir = $sysconfdir" add_config "CC ?= $CC" -[ -z "$CPPFLAGS" ] || add_config "CPPFLAGS ?= $CPPFLAGS" -[ -z "$CFLAGS" ] || add_config "CFLAGS ?= $CFLAGS" +[ -z "$CPPFLAGS" ] || add_config "USER_CPPFLAGS = $CPPFLAGS" +[ -z "$CFLAGS" ] || add_config "USER_CFLAGS = $CFLAGS" +[ -z "$LDFLAGS" ] || add_config "USER_LDFLAGS = $LDFLAGS" add_cflags "-DXCHATLIBDIR=\\\"$libdir/xchat\\\"" add_cflags "-DXCHATSHAREDIR=\\\"$prefix/share/xchat\\\"" @@ -298,6 +299,7 @@ if isbsd || ismac ; then add_config "INSTALL_FLAGS=-m" fi - +add_cflags "\$(USER_CPPFLAGS) \$(USER_CFLAGS)" +add_ldflags "\$(USER_LDFLAGS)" echo done, now run make \&\& make install -- 2.11.4.GIT