# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1370191232 14400
# Node ID bcc26ffe9a0f3bd8915095ccff2ad19170f1261d
# Parent  100e618349f730c6c2e251c35a99baf63d23843d
use variable for --host and --build configure arguments

diff -r 100e618349f7 -r bcc26ffe9a0f Makefile
--- a/Makefile	Sun Jun 02 10:31:04 2013 -0400
+++ b/Makefile	Sun Jun 02 12:40:32 2013 -0400
@@ -29,6 +29,7 @@
 else
   TARGET := i686-pc-mingw32
 endif
+BUILD_SYSTEM := $(shell tools/config.guess)
 
 # Enable shared or static libs, or perhaps both.  At least one 
 # package uses --with instead of --enable.  Probably it doesn't
@@ -41,6 +42,11 @@
 
 ## end of configuration variables.
 
+ifneq ($(MXE_NATIVE_BUILD),yes)
+  HOST_AND_BUILD_CONFIGURE_OPTIONS := \
+    --host='$(TARGET)' --build='$(BUILD_SYSTEM)'
+endif
+
 # These can't be chosen arbitrarily.  The way things are configured now,
 # GCC expects to find cross-compiler include files in $(PREFIX)/$(TARGET).
 # and it's not clear to me how to change that.
diff -r 100e618349f7 -r bcc26ffe9a0f src/agg.mk
--- a/src/agg.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/agg.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     $(SED) -i 's,aclocal,aclocal -I $(HOST_PREFIX)/share/aclocal,' '$(1)/autogen.sh'
     $(SED) -i 's,libtoolize,$(LIBTOOLIZE),'                             '$(1)/autogen.sh'
     cd '$(1)' && $(SHELL) ./autogen.sh \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --without-x
diff -r 100e618349f7 -r bcc26ffe9a0f src/apr-util.mk
--- a/src/apr-util.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/apr-util.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --without-pgsql \
         --without-sqlite2 \
diff -r 100e618349f7 -r bcc26ffe9a0f src/apr.mk
--- a/src/apr.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/apr.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         ac_cv_sizeof_off_t=4 \
         ac_cv_sizeof_pid_t=4 \
diff -r 100e618349f7 -r bcc26ffe9a0f src/arpack.mk
--- a/src/arpack.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/arpack.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -22,8 +22,7 @@
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --enable-static --disable-shared \
 	$($(PKG)_CONFIGURE_PIC_OPTION) \
         --prefix='$(HOST_PREFIX)'
diff -r 100e618349f7 -r bcc26ffe9a0f src/atk.mk
--- a/src/atk.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/atk.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-glibtest \
diff -r 100e618349f7 -r bcc26ffe9a0f src/atkmm.mk
--- a/src/atkmm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/atkmm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         MAKE=$(MAKE)
diff -r 100e618349f7 -r bcc26ffe9a0f src/aubio.mk
--- a/src/aubio.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/aubio.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-jack \
         --prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/bfd.mk
--- a/src/bfd.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/bfd.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -16,7 +16,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)/bfd' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --target='$(TARGET)' \
         --prefix='$(HOST_PREFIX)' \
         --enable-install-libbfd \
diff -r 100e618349f7 -r bcc26ffe9a0f src/binutils.mk
--- a/src/binutils.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/binutils.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -29,7 +29,7 @@
 
     cd '$(1)' && ./configure \
         --target='$(TARGET)' \
-        --build="`config.guess`" \
+        --build='$(BUILD_SYSTEM)' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --with-gcc \
         --with-gnu-ld \
diff -r 100e618349f7 -r bcc26ffe9a0f src/cairo.mk
--- a/src/cairo.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/cairo.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     $(SED) -i 's,libpng12,libpng,g'                          '$(1)/configure'
     $(SED) -i 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' '$(1)/src/cairo.pc.in'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-gtk-doc \
diff -r 100e618349f7 -r bcc26ffe9a0f src/cairomm.mk
--- a/src/cairomm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/cairomm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         MAKE=$(MAKE)
diff -r 100e618349f7 -r bcc26ffe9a0f src/cppunit.mk
--- a/src/cppunit.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/cppunit.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-doxygen \
diff -r 100e618349f7 -r bcc26ffe9a0f src/cunit.mk
--- a/src/cunit.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/cunit.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
diff -r 100e618349f7 -r bcc26ffe9a0f src/curl.mk
--- a/src/curl.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/curl.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-gnutls \
diff -r 100e618349f7 -r bcc26ffe9a0f src/dbus.mk
--- a/src/dbus.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/dbus.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --with-xml=expat \
         --disable-tests \
diff -r 100e618349f7 -r bcc26ffe9a0f src/dcmtk.mk
--- a/src/dcmtk.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/dcmtk.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --with-openssl \
         --with-libtiff \
diff -r 100e618349f7 -r bcc26ffe9a0f src/devil.mk
--- a/src/devil.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/devil.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-ILU \
diff -r 100e618349f7 -r bcc26ffe9a0f src/exiv2.mk
--- a/src/exiv2.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/exiv2.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-visibility \
diff -r 100e618349f7 -r bcc26ffe9a0f src/expat.mk
--- a/src/expat.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/expat.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/faad2.mk
--- a/src/faad2.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/faad2.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff -r 100e618349f7 -r bcc26ffe9a0f src/fftw.mk
--- a/src/fftw.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/fftw.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-threads \
@@ -29,8 +28,7 @@
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-threads \
@@ -39,8 +37,7 @@
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-threads \
diff -r 100e618349f7 -r bcc26ffe9a0f src/file.mk
--- a/src/file.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/file.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -27,8 +27,7 @@
     $(MAKE) -C '$(1).native/src' -j '$(JOBS)' file
 
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= FILE_COMPILE='$(1).native/src/file'
diff -r 100e618349f7 -r bcc26ffe9a0f src/flac.mk
--- a/src/flac.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/flac.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-doxygen-docs \
diff -r 100e618349f7 -r bcc26ffe9a0f src/fltk.mk
--- a/src/fltk.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/fltk.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -26,8 +26,7 @@
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
 	DSOFLAGS='-L$(HOST_PREFIX)/lib' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-threads
diff -r 100e618349f7 -r bcc26ffe9a0f src/fontconfig.mk
--- a/src/fontconfig.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/fontconfig.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         FREETYPE_CFLAGS='-I$(HOST_PREFIX)/include/freetype2' \
         FREETYPE_LIBS='-lfreetype' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-arch='$(TARGET)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/freeglut.mk
--- a/src/freeglut.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/freeglut.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./autogen.sh
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-replace-glut \
diff -r 100e618349f7 -r bcc26ffe9a0f src/freetds.mk
--- a/src/freetds.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/freetds.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -25,8 +25,7 @@
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --disable-rpath \
         --disable-dependency-tracking \
         $(ENABLE_SHARED_OR_STATIC) \
diff -r 100e618349f7 -r bcc26ffe9a0f src/freetype.mk
--- a/src/freetype.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/freetype.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && GNUMAKE=$(MAKE) ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/fribidi.mk
--- a/src/fribidi.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/fribidi.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 define $(PKG)_BUILD
     $(SED) -i 's,__declspec(dllimport),,' '$(1)/lib/fribidi-common.h'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-debug \
diff -r 100e618349f7 -r bcc26ffe9a0f src/ftgl.mk
--- a/src/ftgl.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/ftgl.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -21,7 +21,7 @@
     cd '$(1)' && automake --gnu
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --without-x \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gc.mk
--- a/src/gc.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gc.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --enable-threads=win32 \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gcc.mk
--- a/src/gcc.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gcc.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -78,7 +78,7 @@
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
         --target='$(TARGET)' \
-        --build="`config.guess`" \
+        --build='$(BUILD_SYSTEM)' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --libdir='$(BUILD_TOOLS_PREFIX)/lib' \
         --enable-languages='c,c++,fortran' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gd.mk
--- a/src/gd.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gd.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -28,7 +28,7 @@
     $(SED) -i 's,-lX11 ,,g'     '$(1)/configure'
     $(SED) -i 's,png12,png15,g' '$(1)/configure'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-freetype='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gdal.mk
--- a/src/gdal.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gdal.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     # The option '--without-threads' means native win32 threading without pthread.
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-bsb \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gdb.mk
--- a/src/gdb.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gdb.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         CONFIG_SHELL=$(SHELL)
diff -r 100e618349f7 -r bcc26ffe9a0f src/gdk-pixbuf.mk
--- a/src/gdk-pixbuf.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gdk-pixbuf.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && autoreconf && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-modules \
diff -r 100e618349f7 -r bcc26ffe9a0f src/geos.mk
--- a/src/geos.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/geos.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/gettext.mk
--- a/src/gettext.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gettext.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)/gettext-runtime' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-threads=win32 \
diff -r 100e618349f7 -r bcc26ffe9a0f src/giflib.mk
--- a/src/giflib.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/giflib.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -21,8 +21,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         CPPFLAGS='-D_OPEN_BINARY'
diff -r 100e618349f7 -r bcc26ffe9a0f src/glib.mk
--- a/src/glib.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/glib.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -69,8 +69,7 @@
         $($(PKG)_NATIVE_BUILD))
     # cross build
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-threads=win32 \
diff -r 100e618349f7 -r bcc26ffe9a0f src/glibmm.mk
--- a/src/glibmm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/glibmm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         CXX='$(TARGET)-c++' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/glpk.mk
--- a/src/glpk.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/glpk.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/gmp.mk
--- a/src/gmp.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gmp.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && CC_FOR_BUILD=gcc ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --enable-cxx \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gnutls.mk
--- a/src/gnutls.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gnutls.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -26,8 +26,7 @@
     # Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-nls \
diff -r 100e618349f7 -r bcc26ffe9a0f src/graphicsmagick.mk
--- a/src/graphicsmagick.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/graphicsmagick.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     # This can be removed once the patch "graphicsmagick-1-fix-xml2-config.patch" is accepted by upstream
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --without-modules \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gsl.mk
--- a/src/gsl.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gsl.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff -r 100e618349f7 -r bcc26ffe9a0f src/gsoap.mk
--- a/src/gsoap.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gsoap.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -40,8 +40,7 @@
     # http://groups.google.com/group/ikarus-users/browse_thread/thread/fd1d101eac32633f
     cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --enable-gnutls \
         CPPFLAGS='-DWITH_NTLM'
 
diff -r 100e618349f7 -r bcc26ffe9a0f src/gst-plugins-base.mk
--- a/src/gst-plugins-base.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gst-plugins-base.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
         -exec $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g'       {} \; \
         -exec $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' {} \;
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gst-plugins-good.mk
--- a/src/gst-plugins-good.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gst-plugins-good.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -23,8 +23,7 @@
     #   http://www.videolan.org/developers/vlc/doc/doxygen/html/vlc__codecs_8h-source.html
     #   http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2004-August/019283.html
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gstreamer.mk
--- a/src/gstreamer.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gstreamer.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g'       '$(1)'/gst/Makefile.in
     $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gta.mk
--- a/src/gta.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gta.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-reference \
         --prefix='$(HOST_PREFIX)'
diff -r 100e618349f7 -r bcc26ffe9a0f src/gtk2.mk
--- a/src/gtk2.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gtk2.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-explicit-deps \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gtkglarea.mk
--- a/src/gtkglarea.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gtkglarea.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && autoreconf -fi # to be removed if patch is integrated upstream
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/gtkglext.mk
--- a/src/gtkglext.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gtkglext.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --without-x \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gtkglextmm.mk
--- a/src/gtkglextmm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gtkglextmm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gtkmm2.mk
--- a/src/gtkmm2.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gtkmm2.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         MAKE=$(MAKE)
diff -r 100e618349f7 -r bcc26ffe9a0f src/gtksourceview.mk
--- a/src/gtksourceview.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gtksourceview.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-gtk-doc \
diff -r 100e618349f7 -r bcc26ffe9a0f src/gtksourceviewmm2.mk
--- a/src/gtksourceviewmm2.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/gtksourceviewmm2.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         MAKE=$(MAKE)
diff -r 100e618349f7 -r bcc26ffe9a0f src/guile.mk
--- a/src/guile.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/guile.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -21,8 +21,7 @@
     # won't try to use the "struct timespec" from <pthreads.h>,
     # which would fail because we tell Guile not to use Pthreads.
     cd '$(1)' && CC_FOR_BUILD=gcc ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --without-threads \
diff -r 100e618349f7 -r bcc26ffe9a0f src/harfbuzz.mk
--- a/src/harfbuzz.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/harfbuzz.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/hdf5.mk
--- a/src/hdf5.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/hdf5.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -44,8 +44,7 @@
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-direct-vfd \
diff -r 100e618349f7 -r bcc26ffe9a0f src/hunspell.mk
--- a/src/hunspell.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/hunspell.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     # Note: the configure file doesn't pick up pdcurses, so "ui" is disabled
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-warnings \
         --without-ui \
diff -r 100e618349f7 -r bcc26ffe9a0f src/id3lib.mk
--- a/src/id3lib.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/id3lib.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/ilmbase.mk
--- a/src/ilmbase.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/ilmbase.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -25,8 +25,7 @@
     # Because of the previous changes, '--disable-threading' will not disable
     # threading. It will just disable the unwanted check for pthread.
     cd '$(1)' && $(SHELL) ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-threading \
diff -r 100e618349f7 -r bcc26ffe9a0f src/imagemagick.mk
--- a/src/imagemagick.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/imagemagick.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-x=no \
diff -r 100e618349f7 -r bcc26ffe9a0f src/jasper.mk
--- a/src/jasper.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/jasper.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && autoreconf && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-libjpeg \
diff -r 100e618349f7 -r bcc26ffe9a0f src/jpeg.mk
--- a/src/jpeg.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/jpeg.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
 endef
diff -r 100e618349f7 -r bcc26ffe9a0f src/json-c.mk
--- a/src/json-c.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/json-c.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,9 +18,8 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./autogen.sh
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
-        --build="`config.guess`"\
         $(ENABLE_SHARED_OR_STATIC)
         CFLAGS=-Wno-error
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/lame.mk
--- a/src/lame.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/lame.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff -r 100e618349f7 -r bcc26ffe9a0f src/lcms.mk
--- a/src/lcms.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/lcms.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-jpeg \
         --with-tiff \
diff -r 100e618349f7 -r bcc26ffe9a0f src/lcms1.mk
--- a/src/lcms1.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/lcms1.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-jpeg \
         --with-tiff \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libarchive.mk
--- a/src/libarchive.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libarchive.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
     $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive.h'
     $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive_entry.h'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-bsdtar \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libass.mk
--- a/src/libass.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libass.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-enca \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libcroco.mk
--- a/src/libcroco.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libcroco.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-gtk-doc
diff -r 100e618349f7 -r bcc26ffe9a0f src/libdnet.mk
--- a/src/libdnet.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libdnet.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -27,7 +27,7 @@
     $(SED) -i 's,#include <Ntddndis.h>,#include <ddk/ntddndis.h>,' '$(1)/src/eth-win32.c'
     $(SED) -i 's,-mno-cygwin,,' '$(1)/configure'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/libevent.mk
--- a/src/libevent.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libevent.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
diff -r 100e618349f7 -r bcc26ffe9a0f src/libffi.mk
--- a/src/libffi.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libffi.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)'
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgcrypt.mk
--- a/src/libgcrypt.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgcrypt.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && autoreconf && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgda.mk
--- a/src/libgda.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgda.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,7 +20,7 @@
     $(SED) -i 's,glib-mkenums,'$(HOST_PREFIX)/bin/glib-mkenums',g' '$(1)/libgda/sql-parser/Makefile.in'
     $(SED) -i 's,glib-mkenums,'$(HOST_PREFIX)/bin/glib-mkenums',g' '$(1)/libgda-ui/Makefile.in'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-gtk-doc \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgdamm.mk
--- a/src/libgdamm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgdamm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         CXX='$(TARGET)-c++' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgee.mk
--- a/src/libgee.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgee.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgeotiff.mk
--- a/src/libgeotiff.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgeotiff.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,7 +20,7 @@
     $(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in'
     touch '$(1)/configure'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz"
diff -r 100e618349f7 -r bcc26ffe9a0f src/libglade.mk
--- a/src/libglade.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libglade.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config'
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgnurx.mk
--- a/src/libgnurx.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgnurx.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,7 +20,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install install-static
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgomp.mk
--- a/src/libgomp.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgomp.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 define $(PKG)_BUILD
     mkdir -p '$(1)/build/$(TARGET)/libgomp'
     cd       '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --target='$(TARGET)' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --enable-version-specific-runtime-libs \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgpg_error.mk
--- a/src/libgpg_error.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgpg_error.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-nls \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgsasl.mk
--- a/src/libgsasl.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgsasl.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && touch src/libgsasl-7.def && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-nls \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libgsf.mk
--- a/src/libgsf.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libgsf.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -21,8 +21,7 @@
     $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in
     echo 'Libs.private: -lz -lbz2'          >> '$(1)'/libgsf-1.pc.in
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-nls \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libharu.mk
--- a/src/libharu.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libharu.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-zlib='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libiberty.mk
--- a/src/libiberty.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libiberty.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -16,7 +16,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-install-libiberty
diff -r 100e618349f7 -r bcc26ffe9a0f src/libiconv.mk
--- a/src/libiconv.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libiconv.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     $(SED) -i 's, sed , $(SED) ,g' '$(1)/windows/windres-options'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         CPPFLAGS='$(MXE_CPPFLAGS)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libidn.mk
--- a/src/libidn.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libidn.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-csharp \
         --prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libircclient.mk
--- a/src/libircclient.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libircclient.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --disable-debug \
         --enable-threads \
         --disable-ipv6
diff -r 100e618349f7 -r bcc26ffe9a0f src/liblo.mk
--- a/src/liblo.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/liblo.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/libmad.mk
--- a/src/libmad.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libmad.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     $(SED) -i '/-fforce-mem/d' '$(1)'/configure
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/libmng.mk
--- a/src/libmng.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libmng.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -22,8 +22,7 @@
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --enable-shared
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/libmodplug.mk
--- a/src/libmodplug.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libmodplug.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/libntlm.mk
--- a/src/libntlm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libntlm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/liboauth.mk
--- a/src/liboauth.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/liboauth.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-curl
diff -r 100e618349f7 -r bcc26ffe9a0f src/libodbc++.mk
--- a/src/libodbc++.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libodbc++.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
       --prefix='$(HOST_PREFIX)' \
-      --host='$(TARGET)' \
+      $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
       $(ENABLE_SHARED_OR_STATIC) \
       --without-tests \
       --disable-dependency-tracking
diff -r 100e618349f7 -r bcc26ffe9a0f src/liboil.mk
--- a/src/liboil.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/liboil.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libpano13.mk
--- a/src/libpano13.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libpano13.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -24,7 +24,7 @@
     $(SED) -i 's,mv.*libpano13\.dll.*,,'                                                   '$(1)/Makefile.in'
     cd '$(1)' && ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-jpeg='$(HOST_PREFIX)'/lib \
         --with-tiff='$(HOST_PREFIX)'/lib \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libpaper.mk
--- a/src/libpaper.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libpaper.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/libpng.mk
--- a/src/libpng.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libpng.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -24,8 +24,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/librsvg.mk
--- a/src/librsvg.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/librsvg.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-pixbuf-loader \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libsamplerate.mk
--- a/src/libsamplerate.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libsamplerate.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/libshout.mk
--- a/src/libshout.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libshout.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-thread \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libsigc++.mk
--- a/src/libsigc++.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libsigc++.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         CXX='$(TARGET)-c++' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libsndfile.mk
--- a/src/libsndfile.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libsndfile.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-sqlite \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libssh2.mk
--- a/src/libssh2.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libssh2.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,7 +20,7 @@
     cd '$(1)' && ./buildconf
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --without-openssl \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libtool.mk
--- a/src/libtool.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libtool.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)/libltdl' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --enable-ltdl-install
diff -r 100e618349f7 -r bcc26ffe9a0f src/libunistring.mk
--- a/src/libunistring.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libunistring.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --enable-threads=win32
diff -r 100e618349f7 -r bcc26ffe9a0f src/libxml++.mk
--- a/src/libxml++.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libxml++.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && CXX="$(TARGET)-g++ -mthreads" ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         MAKE=$(MAKE)
diff -r 100e618349f7 -r bcc26ffe9a0f src/libxml2.mk
--- a/src/libxml2.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libxml2.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
     $(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in'
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --without-debug \
         --prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/libxslt.mk
--- a/src/libxslt.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/libxslt.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --without-debug \
         --prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/log4cxx.mk
--- a/src/log4cxx.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/log4cxx.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-apr='$(HOST_PREFIX)' \
         --with-apr-util='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/lzo.mk
--- a/src/lzo.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/lzo.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/matio.mk
--- a/src/matio.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/matio.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-test \
diff -r 100e618349f7 -r bcc26ffe9a0f src/mdbtools.mk
--- a/src/mdbtools.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/mdbtools.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -21,8 +21,7 @@
     '$(SED)' -i 's/libtooloze/libtoolize/g;' '$(1)/autogen.sh'
     cd '$(1)' && NOCONFIGURE=1 ./autogen.sh
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config'
diff -r 100e618349f7 -r bcc26ffe9a0f src/mingw-utils.mk
--- a/src/mingw-utils.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/mingw-utils.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -26,7 +26,7 @@
 
     # cross build
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff -r 100e618349f7 -r bcc26ffe9a0f src/mpfr.mk
--- a/src/mpfr.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/mpfr.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-threads=win32 \
diff -r 100e618349f7 -r bcc26ffe9a0f src/muparser.mk
--- a/src/muparser.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/muparser.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-samples \
diff -r 100e618349f7 -r bcc26ffe9a0f src/mxml.mk
--- a/src/mxml.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/mxml.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-threads
diff -r 100e618349f7 -r bcc26ffe9a0f src/native-binutils.mk
--- a/src/native-binutils.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/native-binutils.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -28,8 +28,7 @@
 
     cd '$(1)' && ./configure \
         --target='$(TARGET)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='/usr' \
         --with-gcc \
         --with-gnu-ld \
diff -r 100e618349f7 -r bcc26ffe9a0f src/native-gcc.mk
--- a/src/native-gcc.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/native-gcc.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -33,8 +33,7 @@
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
         --target='$(TARGET)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='/usr' \
         --libdir='/usr/lib' \
         --enable-languages='c,c++,objc,fortran' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/ncurses.mk
--- a/src/ncurses.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/ncurses.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix=$(HOST_PREFIX) \
         --disable-home-terminfo \
         --enable-sp-funcs \
diff -r 100e618349f7 -r bcc26ffe9a0f src/nettle.mk
--- a/src/nettle.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/nettle.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o
diff -r 100e618349f7 -r bcc26ffe9a0f src/octave.mk
--- a/src/octave.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/octave.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -30,8 +30,7 @@
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) \
         LDFLAGS='-Wl,-rpath-link,$(MXE_LIBDIR) -L$(MXE_LIBDIR)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
 	$($(PKG)_CROSS_CONFIG_OPTIONS)
 
diff -r 100e618349f7 -r bcc26ffe9a0f src/ogg.mk
--- a/src/ogg.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/ogg.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/opencore-amr.mk
--- a/src/opencore-amr.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/opencore-amr.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff -r 100e618349f7 -r bcc26ffe9a0f src/openexr.mk
--- a/src/openexr.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/openexr.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -23,7 +23,7 @@
         (cd '$(1)/$(ilmbase_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
     echo 'echo $1' > '$(1)/$(ilmbase_SUBDIR)/config.sub'
     cd '$(1)/$(ilmbase_SUBDIR)' && $(SHELL) ./configure \
-        --build="`config.guess`" \
+        --build='$(BUILD_SYSTEM)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(1)/ilmbase' \
         --enable-threading=no \
@@ -32,8 +32,7 @@
     $(MAKE) -C '$(1)/$(ilmbase_SUBDIR)' -j '$(JOBS)' install \
         bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-threading \
diff -r 100e618349f7 -r bcc26ffe9a0f src/pango.mk
--- a/src/pango.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/pango.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
     rm '$(1)'/docs/Makefile.am
     cd '$(1)' && NOCONFIGURE=1 ./autogen.sh
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-gtk-doc \
diff -r 100e618349f7 -r bcc26ffe9a0f src/pangomm.mk
--- a/src/pangomm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/pangomm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         MAKE=$(MAKE)
diff -r 100e618349f7 -r bcc26ffe9a0f src/pcre.mk
--- a/src/pcre.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/pcre.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
     $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in'
     $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-pcre16 \
diff -r 100e618349f7 -r bcc26ffe9a0f src/pdflib_lite.mk
--- a/src/pdflib_lite.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/pdflib_lite.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     cd '$(1)' && aclocal -I config --install
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --without-openssl \
diff -r 100e618349f7 -r bcc26ffe9a0f src/pfstools.mk
--- a/src/pfstools.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/pfstools.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-netpbm \
diff -r 100e618349f7 -r bcc26ffe9a0f src/pixman.mk
--- a/src/pixman.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/pixman.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/plibc.mk
--- a/src/plibc.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/plibc.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 define $(PKG)_BUILD
     chmod 0755 '$(1)/configure'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/plotmm.mk
--- a/src/plotmm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/plotmm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install \
diff -r 100e618349f7 -r bcc26ffe9a0f src/plotutils.mk
--- a/src/plotutils.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/plotutils.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,7 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --enable-libplotter \
         --enable-libxmi \
diff -r 100e618349f7 -r bcc26ffe9a0f src/poppler.mk
--- a/src/poppler.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/poppler.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -21,8 +21,7 @@
     #       because libtiff is not found, but because some references are
     #       undefined)
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --disable-silent-rules \
         $(ENABLE_SHARED_OR_STATIC) \
diff -r 100e618349f7 -r bcc26ffe9a0f src/popt.mk
--- a/src/popt.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/popt.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-nls
diff -r 100e618349f7 -r bcc26ffe9a0f src/portaudio.mk
--- a/src/portaudio.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/portaudio.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-host_os=mingw \
diff -r 100e618349f7 -r bcc26ffe9a0f src/postgresql.mk
--- a/src/postgresql.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/postgresql.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -33,8 +33,7 @@
     cd '$(1)' && ./configure \
         $($(PKG)_CONFIGURE_FLAGS_OPTION) \
         --prefix='$(HOST_PREFIX)' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --enable-shared \
         --disable-rpath \
         --without-tcl \
diff -r 100e618349f7 -r bcc26ffe9a0f src/proj.mk
--- a/src/proj.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/proj.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-mutex
diff -r 100e618349f7 -r bcc26ffe9a0f src/protobuf.mk
--- a/src/protobuf.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/protobuf.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -24,7 +24,7 @@
     $(MAKE) -C '$(1)' -j 1 distclean
 # Second step: Build for target system.
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-zlib \
diff -r 100e618349f7 -r bcc26ffe9a0f src/pstoedit.mk
--- a/src/pstoedit.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/pstoedit.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
     cd '$(1)' && autoreconf
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)'
 
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/qdbm.mk
--- a/src/qdbm.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/qdbm.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --enable-lzo \
         --enable-bzip \
diff -r 100e618349f7 -r bcc26ffe9a0f src/qhull.mk
--- a/src/qhull.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/qhull.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/qrupdate.mk
--- a/src/qrupdate.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/qrupdate.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,8 +20,7 @@
     cd '$(1)' && autoreconf -W none
     chmod a+rx '$(1)/configure'
     cd '$(1)/.build' && '$(1)/configure' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)'
 
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/readline.mk
--- a/src/readline.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/readline.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -32,7 +32,7 @@
     $(SED) -i 's,^ *case SIGTSTP:.*,,' '$(1)/signals.c'
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-multibyte \
diff -r 100e618349f7 -r bcc26ffe9a0f src/sdl.mk
--- a/src/sdl.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sdl.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
     $(SED) -i 's,-mwindows,-lwinmm -mwindows,' '$(1)/configure'
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-threads \
diff -r 100e618349f7 -r bcc26ffe9a0f src/sdl_image.mk
--- a/src/sdl_image.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sdl_image.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     $(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng,' '$(1)/SDL_image.pc.in'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-sdl-prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/sdl_mixer.mk
--- a/src/sdl_mixer.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sdl_mixer.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -24,7 +24,7 @@
         >> '$(1)/SDL_mixer.pc.in'
     $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-sdl-prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/sdl_net.mk
--- a/src/sdl_net.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sdl_net.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-sdl-prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/sdl_pango.mk
--- a/src/sdl_pango.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sdl_pango.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
     $(SED) -i 's,\r$$,,'                        '$(1)/SDL_Pango.pc.in'
     $(SED) -i 's,^\(Requires:.*\),\1 pangoft2,' '$(1)/SDL_Pango.pc.in'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-sdl-prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/sdl_sound.mk
--- a/src/sdl_sound.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sdl_sound.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-sdl-prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/sdl_ttf.mk
--- a/src/sdl_ttf.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sdl_ttf.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-sdl-prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/smpeg.mk
--- a/src/smpeg.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/smpeg.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         AR='$(TARGET)-ar' \
         NM='$(TARGET)-nm' \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
         --prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/sox.mk
--- a/src/sox.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sox.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -24,9 +24,8 @@
     $(SED) 's, sox_LDADD += ,,g' | tr -d '\n'` >>'$(1)/sox.pc.in'
 
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
-        --build="`config.guess`" \
         $(ENABLE_SHARED_OR_STATIC)
 
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS=
diff -r 100e618349f7 -r bcc26ffe9a0f src/speex.mk
--- a/src/speex.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/speex.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-oggtest
diff -r 100e618349f7 -r bcc26ffe9a0f src/sqlite.mk
--- a/src/sqlite.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/sqlite.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-readline \
diff -r 100e618349f7 -r bcc26ffe9a0f src/stable-octave.mk
--- a/src/stable-octave.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/stable-octave.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 define $(PKG)_BUILD
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         FLTK_CONFIG="$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config" \
         gl_cv_func_gettimeofday_clobber=no
diff -r 100e618349f7 -r bcc26ffe9a0f src/t4k_common.mk
--- a/src/t4k_common.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/t4k_common.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-sdlpango \
diff -r 100e618349f7 -r bcc26ffe9a0f src/termcap.mk
--- a/src/termcap.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/termcap.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
     cd '$(1)' && autoreconf
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         AR=$(TARGET)-ar
 
diff -r 100e618349f7 -r bcc26ffe9a0f src/texinfo.mk
--- a/src/texinfo.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/texinfo.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)'
 
     ## All we need for Octave is makeinfo.
diff -r 100e618349f7 -r bcc26ffe9a0f src/theora.mk
--- a/src/theora.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/theora.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_DATA=
diff -r 100e618349f7 -r bcc26ffe9a0f src/tiff.mk
--- a/src/tiff.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/tiff.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --without-x
diff -r 100e618349f7 -r bcc26ffe9a0f src/tre.mk
--- a/src/tre.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/tre.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-nls
diff -r 100e618349f7 -r bcc26ffe9a0f src/vorbis.mk
--- a/src/vorbis.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/vorbis.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         PKG_CONFIG='$(TARGET)-pkg-config'
diff -r 100e618349f7 -r bcc26ffe9a0f src/wget.mk
--- a/src/wget.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/wget.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     $(SED) -i 's/^base64_encode /wget_base64_encode /;' '$(1)/src/utils.c'
     $(SED) -i 's/-lidn/`i686-pc-mingw32-pkg-config --libs libidn`/g;' '$(1)/configure'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --with-ssl=gnutls
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/wxwidgets.mk
--- a/src/wxwidgets.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/wxwidgets.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,8 +19,7 @@
     $(SED) -i 's,png_check_sig,png_sig_cmp,g'                       '$(1)/configure'
     $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/configure'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-compat24 \
@@ -68,8 +67,7 @@
     $(SED) -i 's,png_check_sig,png_sig_cmp,g'                       '$(1)/$(wxwidgets_SUBDIR)/configure'
     $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/$(wxwidgets_SUBDIR)/configure'
     cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --enable-compat24 \
diff -r 100e618349f7 -r bcc26ffe9a0f src/x264.mk
--- a/src/x264.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/x264.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -16,7 +16,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --cross-prefix='$(TARGET)'- \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --enable-win32thread
diff -r 100e618349f7 -r bcc26ffe9a0f src/xapian-core.mk
--- a/src/xapian-core.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/xapian-core.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
diff -r 100e618349f7 -r bcc26ffe9a0f src/xerces.mk
--- a/src/xerces.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/xerces.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && CONFIG_SHELL='$(SHELL)' ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-sse2 \
         --prefix='$(HOST_PREFIX)' \
diff -r 100e618349f7 -r bcc26ffe9a0f src/xine-lib.mk
--- a/src/xine-lib.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/xine-lib.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -23,7 +23,7 @@
     cd '$(1)' && autoconf
 
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-mmap \
diff -r 100e618349f7 -r bcc26ffe9a0f src/xmlwrapp.mk
--- a/src/xmlwrapp.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/xmlwrapp.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,7 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         PKG_CONFIG='$(TARGET)-pkg-config'
diff -r 100e618349f7 -r bcc26ffe9a0f src/xvidcore.mk
--- a/src/xvidcore.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/xvidcore.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -18,8 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' BUILD_DIR='build' SHARED_LIB=
     $(INSTALL) -d '$(HOST_PREFIX)/include'
diff -r 100e618349f7 -r bcc26ffe9a0f src/xz.mk
--- a/src/xz.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/xz.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -17,8 +17,7 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-threads \
diff -r 100e618349f7 -r bcc26ffe9a0f src/zziplib.mk
--- a/src/zziplib.mk	Sun Jun 02 10:31:04 2013 -0400
+++ b/src/zziplib.mk	Sun Jun 02 12:40:32 2013 -0400
@@ -19,7 +19,7 @@
     # don't build and install docs
     (echo '# DISABLED'; echo 'all:'; echo 'install:') > '$(1)/docs/Makefile.in'
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --disable-mmap \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \