From a5b647b3d5c7f45e0e97453ebe4b6119837b7998 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: May 06 2016 15:02:24 +0000
Subject: build system: added support for CFLAGS_UTIL, LDFLAGS_UTIL.


---

diff --git a/Makefile.in b/Makefile.in
index e507a8d..d96bf5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,6 +21,7 @@ CFLAGS_SYSROOT 		= @cflags_sysroot@
 CFLAGS_OS		= @cflags_os@
 CFLAGS_SITE		= @cflags_site@
 CFLAGS_PATH 		= @cflags_path@
+CFLAGS_UTIL 		= @cflags_util@
 
 LDFLAGS_COMMON 		= @ldflags_common@
 LDFLAGS_DEBUG 		= @ldflags_debug@
@@ -28,6 +29,7 @@ LDFLAGS_CMDLINE 	= @ldflags_cmdline@
 LDFLAGS_CONFIG 		= @ldflags_config@
 LDFLAGS_SYSROOT 	= @ldflags_sysroot@
 LDFLAGS_PATH 		= @ldflags_path@
+LDFLAGS_UTIL 		= @ldflags_util@
 
 PE_SUBSYSTEM 		= @pe_subsystem@
 PE_IMAGE_BASE 		= @pe_image_base@
@@ -289,6 +291,7 @@ clean:		clean-implib
 		@echo CFLAGS_OS:'              '$(CFLAGS_OS)
 		@echo CFLAGS_SITE:'            '$(CFLAGS_SITE)
 		@echo CFLAGS_PATH:'            '$(CFLAGS_PATH)
+		@echo CFLAGS_UTIL:'            '$(CFLAGS_UTIL)
 		@echo
 		@echo LDFLAGS_COMMON:'          '$(LDFLAGS_COMMON)
 		@echo LDFLAGS_DEBUG:'           '$(LDFLAGS_DEBUG)
@@ -296,6 +299,7 @@ clean:		clean-implib
 		@echo LDFLAGS_CONFIG:'          '$(LDFLAGS_CONFIG)
 		@echo LDFLAGS_SYSROOT:'         '$(LDFLAGS_SYSROOT)
 		@echo LDFLAGS_PATH:'            '$(LDFLAGS_PATH)
+		@echo LDFLAGS_UTIL:'            '$(LDFLAGS_UTIL)
 		@echo
 
 .display-pe:
diff --git a/config.project b/config.project
index 8cfa489..309970d 100644
--- a/config.project
+++ b/config.project
@@ -26,6 +26,7 @@ mb_default_cflags_cmdline=
 mb_default_cflags_config=
 mb_default_cflags_sysroot=
 mb_default_cflags_path=
+mb_default_cflags_util=
 
 mb_default_ldflags_common="-Llib"
 mb_default_ldflags_debug=
@@ -33,6 +34,7 @@ mb_default_ldflags_cmdline=
 mb_default_ldflags_config=
 mb_default_ldflags_sysroot=
 mb_default_ldflags_path=
+mb_default_ldflags_util=
 
 mb_default_pe_subsystem=windows
 mb_default_pe_image_base=
diff --git a/config.usage b/config.usage
index efb4002..8eadb62 100644
--- a/config.usage
+++ b/config.usage
@@ -68,6 +68,7 @@ supported variables:
 	CFLAGS_CONFIG
 	CFLAGS_SYSROOT
 	CFLAGS_PATH
+	CFLAGS_UTIL
 
 	LDFLAGS
 	LDFLAGS_DEBUG
@@ -76,6 +77,7 @@ supported variables:
 	LDFLAGS_CONFIG
 	LDFLAGS_SYSROOT
 	LDFLAGS_PATH
+	LDFLAGS_UTIL
 
 	PE_SUBSYSTEM
 	PE_IMAGE_BASE
diff --git a/configure b/configure
index d0588de..8fa8472 100755
--- a/configure
+++ b/configure
@@ -68,6 +68,7 @@ init_vars()
 	mb_cflags_os=$CFLAGS_OS
 	mb_cflags_site=$CFLAGS_SITE
 	mb_cflags_path=$CFLAGS_PATH
+	mb_cflags_util=$CFLAGS_UTIL
 
 	mb_ldflags=$LDFLAGS
 	mb_ldflags_debug=$LDFLAGS_DEBUG
@@ -76,6 +77,7 @@ init_vars()
 	mb_ldflags_config=$LDFLAGS_CONFIG
 	mb_ldflags_sysroot=$LDFLAGS_SYSROOT
 	mb_ldflags_path=$LDFLAGS_PATH
+	mb_ldflags_util=$LDFLAGS_UTIL
 
 	mb_pe_subsystem=$PE_SUBSYSTEM
 	mb_pe_image_base=$PE_IMAGE_BASE
@@ -151,6 +153,7 @@ common_defaults()
 	[ -z "$mb_cflags_os" ]		&& mb_cflags_os=$mb_default_cflags_os
 	[ -z "$mb_cflags_site" ]	&& mb_cflags_site=$mb_default_cflags_site
 	[ -z "$mb_cflags_path" ]	&& mb_cflags_path=$mb_default_cflags_path
+	[ -z "$mb_cflags_util" ]	&& mb_cflags_util=$mb_default_cflags_util
 
 	[ -z "$mb_ldflags_debug" ]	&& mb_ldflags_debug=$mb_default_ldflags_debug
 	[ -z "$mb_ldflags_common" ]	&& mb_ldflags_common=$mb_default_ldflags_common
@@ -158,6 +161,7 @@ common_defaults()
 	[ -z "$mb_ldflags_config" ]	&& mb_ldflags_config=$mb_default_ldflags_config
 	[ -z "$mb_ldflags_sysroot" ]	&& mb_ldflags_sysroot=$mb_default_ldflags_sysroot
 	[ -z "$mb_ldflags_path" ]	&& mb_ldflags_path=$mb_default_ldflags_path
+	[ -z "$mb_ldflags_util" ]	&& mb_ldflags_util=$mb_default_ldflags_util
 
 	[ -z "$mb_pe_subsystem" ]	&& mb_pe_subsystem=$mb_default_pe_subsystem
 	[ -z "$mb_pe_image_base" ]	&& mb_pe_image_base=$mb_default_pe_image_base
@@ -344,6 +348,7 @@ config_copy()
 			-e 's^@cflags_os@^'"$mb_cflags_os"'^g'				\
 			-e 's^@cflags_site@^'"$mb_cflags_site"'^g'			\
 			-e 's^@cflags_path@^'"$mb_cflags_path"'^g'			\
+			-e 's^@cflags_util@^'"$mb_cflags_util"'^g'			\
 											\
 			-e 's^@ldflags@^'"$mb_ldflags"'^g'				\
 			-e 's^@ldflags_debug@^'"$mb_ldflags_debug"'^g'			\
@@ -352,6 +357,7 @@ config_copy()
 			-e 's^@ldflags_config@^'"$mb_ldflags_config"'^g'		\
 			-e 's^@ldflags_sysroot@^'"$mb_ldflags_sysroot"'^g'		\
 			-e 's^@ldflags_path@^'"$mb_ldflags_path"'^g'			\
+			-e 's^@ldflags_util@^'"$mb_ldflags_util"'^g'			\
 											\
 			-e 's^@pe_subsystem@^'"$mb_pe_subsystem"'^g'			\
 			-e 's^@pe_image\_base@^'"$mb_pe_image_base"'^g'			\
diff --git a/project/defs.mk b/project/defs.mk
index c1d6693..09e54bd 100644
--- a/project/defs.mk
+++ b/project/defs.mk
@@ -46,7 +46,7 @@ CFLAGS		= $(CFLAGS_DEBUG)  $(CFLAGS_CONFIG)  $(CFLAGS_SYSROOT) \
 
 CFLAGS_SHARED	= $(CFLAGS) $(CFLAGS_PIC) $(CFLAGS_SHARED_ATTR)
 CFLAGS_STATIC	= $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_STATIC_ATTR)
-CFLAGS_APP	= $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_APP_ATTR)
+CFLAGS_APP	= $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_APP_ATTR) $(CFLAGS_UTIL)
 
 LDFLAGS_SHARED	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
 		   $(LDFLAGS_COMMON)  $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST)    \
@@ -54,7 +54,8 @@ LDFLAGS_SHARED	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
 
 LDFLAGS_APP	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
 		   $(LDFLAGS_COMMON)  $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST)    \
-		   $(LDFLAGS_PATH)    $(SHARED_APP_DEPS) $(LDFLAGS_LAST)
+		   $(LDFLAGS_PATH)    $(SHARED_APP_DEPS) $(LDFLAGS_LAST)     \
+		   $(LDFLAGS_UTIL)
 
 LDFLAGS_STATIC	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
 		   $(LDFLAGS_COMMON)  $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST)    \