From fc3fd8afd2d01c74fd67a707f899893f475fb0ee Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Mon, 30 Jul 2007 18:17:13 +0000
Subject: [PATCH] Use TARGET_CONFIGURE_ARGS in some packages lacking

---
 package/bsdiff/bsdiff.mk   | 1 +
 package/madplay/madplay.mk | 1 +
 package/mpg123/mpg123.mk   | 1 +
 package/qte/qte.mk         | 2 +-
 package/xerces/xerces.mk   | 1 +
 package/zlib/zlib.mk       | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index 5fafb10b0..b01f8731e 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -20,6 +20,7 @@ $(BSDIFF_DIR)/.source: $(DL_DIR)/$(BSDIFF_SOURCE)
 
 $(BSDIFF_DIR)/$(BSDIFF_BINARY): $(BSDIFF_DIR)/.source
 	(cd $(BSDIFF_DIR) ; \
+		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
 			$(TARGET_CFLAGS) bsdiff.c -o bsdiff ; \
diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk
index 3ec3be5da..5df0791ad 100644
--- a/package/madplay/madplay.mk
+++ b/package/madplay/madplay.mk
@@ -29,6 +29,7 @@ $(MADPLAY_DIR)/.unpacked: $(DL_DIR)/$(MADPLAY_SOURCE)
 
 $(MADPLAY_DIR)/.configured: $(MADPLAY_DIR)/.unpacked
 	(cd $(MADPLAY_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(BR2_MADPLAY_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
index 5748ede56..5eb5f5e6d 100644
--- a/package/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
@@ -29,6 +29,7 @@ $(MPG123_DIR)/.unpacked:	$(DL_DIR)/$(MPG123_SOURCE)
 
 $(MPG123_DIR)/.configured: $(MPG123_DIR)/.unpacked
 	(cd $(MPG123_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
diff --git a/package/qte/qte.mk b/package/qte/qte.mk
index eabaaf776..d1f3c7d0b 100644
--- a/package/qte/qte.mk
+++ b/package/qte/qte.mk
@@ -136,8 +136,8 @@ $(QTE_QTOPIA_DIR)/.unpacked: $(DL_DIR)/$(QTE_QTOPIA_SOURCE)
 $(QTE_QTE_DIR)/.configured: $(QTE_QTE_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY) $(QTE_QTOPIA_DIR)/.unpacked
 	cp $(QTE_QTOPIA_DIR)/src/qt/qconfig-qpe.h $(QTE_QTE_DIR)/src/tools/
 	(cd $(@D); export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/qws/linux-x86-g++; export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \
-		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		$(TARGET_CONFIGURE_OPTS) \
 		./configure \
 		$(QTE_QTE_CONFIGURE) -qconfig qpe -keypad-mode -qvfb -depths 4,8,16,32 -xplatform $(BR2_QTE_CROSS_PLATFORM) \
 	);
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 71a7ac27e..179402a86 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -22,6 +22,7 @@ $(XERCES_DIR)/.unpacked: $(DL_DIR)/$(XERCES_SOURCE)
 
 $(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
 	(cd $(XERCES_DIR)/src/xercesc; rm -rf config.cache; \
+		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		XERCESCROOT=$(XERCES_DIR) \
 		./runConfigure -plinux -minmem \
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 88f59897f..a94de2733 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -24,6 +24,7 @@ $(ZLIB_DIR)/.patched: $(DL_DIR)/$(ZLIB_SOURCE)
 
 $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched
 	(cd $(ZLIB_DIR); rm -rf config.cache ; \
+		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(ZLIB_CFLAGS)" \
 		./configure \