Mercurial > mxe-octave

changeset 2855:47558e958113

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow static/shared libraries to be configured in top-level Makefile.
author John W. Eaton <jwe@octave.org>
date Thu, 15 Nov 2012 16:11:45 -0500
parents 54522aaf400c
children 4d32dc6aca86
files Makefile src/agg.mk src/apr-util.mk src/apr.mk src/atk.mk src/atkmm.mk src/aubio.mk src/bfd.mk src/binutils.mk src/cairo.mk src/cairomm.mk src/cppunit.mk src/cunit.mk src/curl.mk src/dbus.mk src/devil.mk src/exiv2.mk src/expat.mk src/faad2.mk src/ffmpeg.mk src/fftw.mk src/file.mk src/flac.mk src/fltk.mk src/fontconfig.mk src/freeglut.mk src/freetds.mk src/freetype.mk src/fribidi.mk src/ftgl.mk src/gc.mk src/gcc.mk src/gd.mk src/gdal.mk src/gdb.mk src/gdk-pixbuf.mk src/geos.mk src/gettext.mk src/giflib.mk src/glib.mk src/glibmm.mk src/gmp.mk src/gnutls.mk src/graphicsmagick.mk src/gsl.mk src/gst-plugins-base.mk src/gst-plugins-good.mk src/gstreamer.mk src/gta.mk src/gtk2.mk src/gtkglarea.mk src/gtkglext.mk src/gtkglextmm.mk src/gtkmm2.mk src/gtksourceview.mk src/gtksourceviewmm2.mk src/guile.mk src/harfbuzz.mk src/hunspell.mk src/id3lib.mk src/ilmbase.mk src/imagemagick.mk src/jasper.mk src/jpeg.mk src/json-c.mk src/lame.mk src/lcms.mk src/lcms1.mk src/libarchive.mk src/libass.mk src/libcroco.mk src/libdnet.mk src/libevent.mk src/libffi.mk src/libgcrypt.mk src/libgda.mk src/libgdamm.mk src/libgee.mk src/libgeotiff.mk src/libglade.mk src/libgomp.mk src/libgpg_error.mk src/libgsasl.mk src/libgsf.mk src/libharu.mk src/libiberty.mk src/libiconv.mk src/libidn.mk src/liblo.mk src/libmad.mk src/libmikmod.mk src/libmodplug.mk src/libntlm.mk src/liboauth.mk src/libodbc++.mk src/liboil.mk src/libpano13.mk src/libpaper.mk src/libpng.mk src/librsvg.mk src/libsamplerate.mk src/libshout.mk src/libsigc++.mk src/libsndfile.mk src/libssh2.mk src/libtool.mk src/libunistring.mk src/libxml++.mk src/libxml2.mk src/libxslt.mk src/log4cxx.mk src/lzo.mk src/matio.mk src/mdbtools.mk src/mingw-utils.mk src/mpfr.mk src/muparser.mk src/mxml.mk src/ncurses.mk src/nettle.mk src/ogg.mk src/opencore-amr.mk src/openexr.mk src/pango.mk src/pangomm.mk src/pcre.mk src/pdflib_lite.mk src/pfstools.mk src/pixman.mk src/plibc.mk src/plotmm.mk src/plotutils.mk src/poppler.mk src/popt.mk src/portaudio.mk src/postgresql.mk src/proj.mk src/protobuf.mk src/readline.mk src/sdl.mk src/sdl_image.mk src/sdl_mixer.mk src/sdl_net.mk src/sdl_pango.mk src/sdl_sound.mk src/sdl_ttf.mk src/smpeg.mk src/sox.mk src/speex.mk src/sqlite.mk src/t4k_common.mk src/theora.mk src/tiff.mk src/tre.mk src/vorbis.mk src/wxwidgets.mk src/x264.mk src/xapian-core.mk src/xerces.mk src/xine-lib.mk src/xmlwrapp.mk src/xz.mk src/zlib.mk src/zziplib.mk
diffstat 164 files changed, 209 insertions(+), 193 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Nov 14 10:53:53 2012 +0100
+++ b/Makefile	Thu Nov 15 16:11:45 2012 -0500
@@ -1,6 +1,24 @@
 # This file is part of MXE.
 # See index.html for further information.
 
+# Enable shared or static libs, or perhaps both.  At least one 
+# package uses --with instead of --enable.  Probably it doesn't
+# make sense to disable both...
+BUILD_SHARED := no
+BUILD_STATIC := yes
+ifeq ($(BUILD_SHARED),yes)
+  ifeq ($(BUILD_STATIC),yes)
+    ENABLE_SHARED_OR_STATIC := --enable-shared --enable-static
+    WITH_SHARED_OR_STATIC := --with-shared --with-static
+  else
+    ENABLE_SHARED_OR_STATIC := --enable-shared --disable-static
+    WITH_SHARED_OR_STATIC := --with-shared --without-static
+  endif
+else
+  ENABLE_SHARED_OR_STATIC := --disable-shared --enable-static
+  WITH_SHARED_OR_STATIC := --without-shared --with-static
+endif
+
 JOBS               := 1
 TARGET             := i686-pc-mingw32
 SOURCEFORGE_MIRROR := freefr.dl.sourceforge.net
--- a/src/agg.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/agg.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && $(SHELL) ./autogen.sh \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-x
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/apr-util.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/apr-util.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,8 +21,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
-        --enable-static \
+        $(ENABLE_SHARED_OR_STATIC) \
         --without-pgsql \
         --without-sqlite2 \
         --without-sqlite3 \
--- a/src/apr.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/apr.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,8 +21,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
-        --enable-static \
+        $(ENABLE_SHARED_OR_STATIC) \
         ac_cv_sizeof_off_t=4 \
         ac_cv_sizeof_pid_t=4 \
         ac_cv_sizeof_size_t=4 \
--- a/src/atk.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/atk.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-glibtest \
         --disable-gtk-doc
--- a/src/atkmm.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/atkmm.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/aubio.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/aubio.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-jack \
         --prefix='$(PREFIX)/$(TARGET)' \
         PYTHON='no'
--- a/src/bfd.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/bfd.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
         --target='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-install-libbfd \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)/bfd' -j '$(JOBS)'
     $(MAKE) -C '$(1)/bfd' -j 1 install
 endef
--- a/src/binutils.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/binutils.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -34,7 +34,7 @@
         --with-gnu-ld \
         --with-gnu-as \
         --disable-nls \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-werror
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
--- a/src/cairo.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/cairo.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-gtk-doc \
         --disable-test-surfaces \
--- a/src/cairomm.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/cairomm.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/cppunit.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/cppunit.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-doxygen \
         --disable-dot \
--- a/src/cunit.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/cunit.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
 endef
--- a/src/curl.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/curl.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gnutls \
         --with-libidn \
--- a/src/dbus.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/dbus.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -25,9 +25,8 @@
         --disable-tests \
         --disable-verbose-mode \
         --disable-asserts \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-maintainer-mode \
-        --enable-static \
         --disable-silent-rules
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/devil.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/devil.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-ILU \
         --enable-ILUT \
--- a/src/exiv2.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/exiv2.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-visibility \
         --disable-nls \
--- a/src/expat.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/expat.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/faad2.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/faad2.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/ffmpeg.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/ffmpeg.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -24,7 +24,7 @@
         --arch=i686 \
         --target-os=mingw32 \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
         --disable-doc \
         --enable-memalign-hack \
--- a/src/fftw.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/fftw.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads \
         --enable-double
@@ -31,7 +31,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads \
         --enable-long-double
@@ -41,7 +41,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads \
         --enable-float
--- a/src/file.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/file.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -23,13 +23,13 @@
 
     cp -Rp '$(1)' '$(1).native'
     cd '$(1).native' && ./configure \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1).native/src' -j '$(JOBS)' file
 
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= FILE_COMPILE='$(1).native/src/file'
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
--- a/src/flac.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/flac.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-doxygen-docs \
         --disable-xmms-plugin \
--- a/src/fltk.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/fltk.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads \
         LIBS='-lws2_32'
--- a/src/fontconfig.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/fontconfig.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-arch='$(TARGET)' \
         --with-expat='$(PREFIX)/$(TARGET)'
--- a/src/freeglut.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/freeglut.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./autogen.sh
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-replace-glut \
         --disable-debug \
--- a/src/freetds.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/freetds.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -28,8 +28,7 @@
         --build="`config.guess`" \
         --disable-rpath \
         --disable-dependency-tracking \
-        --disable-shared \
-        --enable-static \
+        $(ENABLE_SHARED_OR_STATIC) \
         --enable-libiconv \
         --enable-msdblib \
         --enable-sspi \
--- a/src/freetype.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/freetype.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && GNUMAKE=$(MAKE) ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/fribidi.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/fribidi.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-debug \
         --disable-deprecated \
--- a/src/ftgl.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/ftgl.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-x \
         --disable-freetypetest \
--- a/src/gc.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gc.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --enable-threads=win32 \
         --enable-cplusplus
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/gcc.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gcc.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -9,6 +9,9 @@
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := mingwrt w32api binutils gcc-gmp gcc-mpc gcc-mpfr
+ifneq ($(BUILD_SHARED),yes)
+$(PKG)_STATIC_FLAG := --static
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \
@@ -39,7 +42,7 @@
         --with-gnu-ld \
         --with-gnu-as \
         --disable-nls \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-sjlj-exceptions \
         --without-x \
         --disable-win32-registry \
@@ -54,7 +57,7 @@
 
     # create pkg-config script
     (echo '#!/bin/sh'; \
-     echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config --static "$$@"') \
+     echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG)) "$$@"') \
              > '$(PREFIX)/bin/$(TARGET)-pkg-config'
     chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config'
 
@@ -62,7 +65,16 @@
     [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))'
     (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \
      echo 'set(MSYS 1)'; \
-     echo 'set(BUILD_SHARED_LIBS OFF)'; \
+     if [ $(BUILD_SHARED) = yes ]; then \
+       echo 'set(BUILD_SHARED_LIBS ON)'; \
+     else \
+       echo 'set(BUILD_SHARED_LIBS OFF)'; \
+     fi; \
+     if [ $(BUILD_STATIC) = yes ]; then \
+       echo 'set(BUILD_STATIC_LIBS ON)'; \
+     else \
+       echo 'set(BUILD_STATIC_LIBS OFF)'; \
+     fi; \
      echo 'set(CMAKE_BUILD_TYPE Release)'; \
      echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \
      echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \
--- a/src/gd.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gd.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -29,7 +29,7 @@
     $(SED) -i 's,png12,png15,g' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-freetype='$(PREFIX)/$(TARGET)' \
         --without-x \
--- a/src/gdal.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gdal.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-bsb \
         --with-grib \
--- a/src/gdb.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gdb.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         CONFIG_SHELL=$(SHELL)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/gdk-pixbuf.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gdk-pixbuf.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,8 +21,7 @@
     cd '$(1)' && autoreconf && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --enable-static \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-modules \
         --with-included-loaders \
--- a/src/geos.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/geos.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
--- a/src/gettext.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gettext.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)/gettext-runtime' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads=win32 \
         --without-libexpat-prefix \
--- a/src/giflib.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/giflib.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -24,7 +24,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         CPPFLAGS='-D_OPEN_BINARY'
     echo 'all:' > '$(1)/doc/Makefile'
     $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install
--- a/src/glib.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/glib.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,13 +21,13 @@
     # native build of libiconv (used by glib-genmarshal)
     cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv)
     cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-nls
     $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)'
 
     # native build for glib-genmarshal, without pkg-config, gettext and zlib
     cd '$(1).native' && ./configure \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-regex \
         --disable-threads \
@@ -71,7 +71,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-threads=win32 \
         --with-pcre=system \
--- a/src/glibmm.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/glibmm.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
--- a/src/gmp.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gmp.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -23,7 +23,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --enable-cxx \
         --without-readline
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/gnutls.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gnutls.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -27,8 +27,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --enable-static \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
         --disable-guile \
--- a/src/graphicsmagick.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/graphicsmagick.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-modules \
         --with-threads \
--- a/src/gsl.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gsl.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,8 +21,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
-        --enable-static
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 
--- a/src/gst-plugins-base.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gst-plugins-base.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -23,7 +23,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
         --disable-examples \
         --disable-x \
--- a/src/gst-plugins-good.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gst-plugins-good.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -26,7 +26,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
         --disable-examples \
         --disable-aalib \
--- a/src/gstreamer.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gstreamer.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
         --disable-check \
         --disable-tests \
--- a/src/gta.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gta.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-reference \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/gtk2.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gtk2.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-explicit-deps \
         --disable-glibtest \
--- a/src/gtkglarea.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gtkglarea.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,6 +22,6 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/gtkglext.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gtkglext.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -23,7 +23,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --without-x \
         --with-gdktarget=win32 \
         --disable-gtk-doc \
--- a/src/gtkglextmm.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gtkglextmm.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install \
         bin_PROGRAMS= \
         sbin_PROGRAMS= \
--- a/src/gtkmm2.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gtkmm2.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/gtksourceview.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gtksourceview.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-gtk-doc \
         GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \
--- a/src/gtksourceviewmm2.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/gtksourceviewmm2.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -23,7 +23,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_install='# DISABLED: doc-install.pl'
--- a/src/guile.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/guile.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -24,7 +24,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --without-threads \
         scm_cv_struct_timespec=no \
         LIBS='-lunistring -lintl -liconv' \
--- a/src/harfbuzz.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/harfbuzz.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,6 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
-        --enable-static
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/hunspell.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/hunspell.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,8 +19,7 @@
     # Note: the configure file doesn't pick up pdcurses, so "ui" is disabled
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --enable-static \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --with-warnings \
         --without-ui \
         --with-readline \
--- a/src/id3lib.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/id3lib.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/ilmbase.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/ilmbase.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -27,7 +27,7 @@
     cd '$(1)' && $(SHELL) ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-threading \
         CONFIG_SHELL=$(SHELL)
--- a/src/imagemagick.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/imagemagick.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --with-x=no \
         --without-zlib \
         ac_cv_prog_freetype_config='$(PREFIX)/$(TARGET)/bin/freetype-config'
--- a/src/jasper.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/jasper.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-libjpeg \
         --disable-opengl \
--- a/src/jpeg.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/jpeg.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
 
     '$(TARGET)-gcc' \
--- a/src/json-c.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/json-c.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --build="`config.guess`"\
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
         CFLAGS=-Wno-error
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 	
--- a/src/lame.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/lame.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/lcms.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/lcms.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --with-jpeg \
         --with-tiff \
         --with-zlib
--- a/src/lcms1.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/lcms1.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --with-jpeg \
         --with-tiff \
         --with-zlib
--- a/src/libarchive.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libarchive.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-bsdtar \
         --disable-bsdcpio \
         XML2_CONFIG='$(PREFIX)/$(TARGET)'/bin/xml2-config
--- a/src/libass.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libass.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-enca \
         --enable-fontconfig
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/libcroco.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libcroco.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-gtk-doc
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libdnet.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libdnet.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -28,7 +28,7 @@
     $(SED) -i 's,-mno-cygwin,,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/libevent.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libevent.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
 endef
--- a/src/libffi.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libffi.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)'
     $(MAKE) -C '$(1)/$(TARGET)' -j 1 install
 
--- a/src/libgcrypt.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgcrypt.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gpg-error-prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libgda.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgda.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-gtk-doc \
         --without-bdb \
         --with-mdb \
--- a/src/libgdamm.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgdamm.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
--- a/src/libgee.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgee.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libgeotiff.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgeotiff.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     touch '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz"
     $(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)'
--- a/src/libglade.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libglade.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/libgomp.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgomp.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -23,7 +23,7 @@
         --prefix='$(PREFIX)' \
         --enable-version-specific-runtime-libs \
         --with-gnu-ld \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         LIBS='-lws2_32'
     $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install
 
--- a/src/libgpg_error.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgpg_error.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
         --disable-languages
--- a/src/libgsasl.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgsasl.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && touch src/libgsasl-7.def && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
         --with-libgcrypt \
--- a/src/libgsf.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libgsf.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -23,7 +23,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
         --disable-gtk-doc \
--- a/src/libharu.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libharu.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --with-zlib='$(PREFIX)/$(TARGET)' \
         --with-png='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/libiberty.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libiberty.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -17,8 +17,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --enable-static \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-install-libiberty
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/libiconv.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libiconv.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-nls
     $(MAKE) -C '$(1)/libcharset' -j '$(JOBS)' install
     $(MAKE) -C '$(1)/lib'        -j '$(JOBS)' install
--- a/src/libidn.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libidn.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-csharp \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-libiconv-prefix='$(PREFIX)/$(TARGET)'
--- a/src/liblo.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/liblo.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libmad.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libmad.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     $(SED) -i '/-fforce-mem/d' '$(1)'/configure
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/libmikmod.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libmikmod.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -24,7 +24,7 @@
         RANLIB='$(TARGET)-ranlib' \
         STRIP='$(TARGET)-strip' \
         ./configure \
-            --disable-shared \
+            $(ENABLE_SHARED_OR_STATIC) \
             --prefix='$(PREFIX)/$(TARGET)' \
             --libdir='$(PREFIX)/$(TARGET)/lib' \
             --disable-esd
--- a/src/libmodplug.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libmodplug.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,8 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
-        --enable-static \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 
--- a/src/libntlm.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libntlm.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/liboauth.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/liboauth.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-curl
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
--- a/src/libodbc++.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libodbc++.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -24,7 +24,7 @@
     cd '$(1)' && ./configure \
       --prefix='$(PREFIX)/$(TARGET)' \
       --host='$(TARGET)' \
-      --disable-shared \
+      $(ENABLE_SHARED_OR_STATIC) \
       --without-tests \
       --disable-dependency-tracking
     $(MAKE) -C '$(1)' -j '$(JOBS)' install doxygen= progref_dist_files=
--- a/src/liboil.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/liboil.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
         --disable-examples \
         --mandir='$(1)/sink' \
--- a/src/libpano13.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libpano13.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -25,7 +25,7 @@
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --with-jpeg='$(PREFIX)/$(TARGET)'/lib \
         --with-tiff='$(PREFIX)/$(TARGET)'/lib \
         --with-png='$(PREFIX)/$(TARGET)'/lib \
--- a/src/libpaper.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libpaper.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/libpng.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libpng.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -25,7 +25,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
--- a/src/librsvg.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/librsvg.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-pixbuf-loader \
         --disable-gtk-theme \
--- a/src/libsamplerate.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libsamplerate.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libshout.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libshout.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-thread \
         --infodir='$(1)/sink' \
         --mandir='$(1)/sink'
--- a/src/libsigc++.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libsigc++.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
--- a/src/libsndfile.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libsndfile.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-sqlite \
         --enable-external-libs \
--- a/src/libssh2.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libssh2.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./buildconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-openssl \
         --with-libgcrypt \
--- a/src/libtool.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libtool.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)/libltdl' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --enable-ltdl-install
     $(MAKE) -C '$(1)/libltdl' -j '$(JOBS)'
     $(MAKE) -C '$(1)/libltdl' -j 1 install
--- a/src/libunistring.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libunistring.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --enable-threads=win32
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
--- a/src/libxml++.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libxml++.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && CXX="$(TARGET)-g++ -mthreads" ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libxml2.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libxml2.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --without-debug \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-python \
--- a/src/libxslt.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/libxslt.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --without-debug \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-libxml-prefix='$(PREFIX)/$(TARGET)' \
--- a/src/log4cxx.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/log4cxx.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,8 +20,7 @@
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
-        --disable-shared \
-        --enable-static \
+        $(ENABLE_SHARED_OR_STATIC) \
         --with-apr='$(PREFIX)/$(TARGET)' \
         --with-apr-util='$(PREFIX)/$(TARGET)' \
         CFLAGS=-D_WIN32_WINNT=0x0500 \
--- a/src/lzo.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/lzo.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/matio.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/matio.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-test \
         --disable-docs
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/mdbtools.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/mdbtools.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -23,7 +23,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
--- a/src/mingw-utils.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/mingw-utils.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     # native build
     cp -Rp '$(1)' '$(1).native'
     cd '$(1).native' && ./configure \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)'
     $(MAKE) -C '$(1).native/reimp' -j '$(JOBS)'
     $(INSTALL) -m755 '$(1).native/reimp/reimp' '$(PREFIX)/bin/$(TARGET)-reimp'
@@ -27,7 +27,7 @@
     # cross build
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
--- a/src/mpfr.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/mpfr.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,8 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --enable-static \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads=win32 \
         --with-gmp-include='$(PREFIX)/$(TARGET)/include/'
--- a/src/muparser.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/muparser.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-samples \
         --disable-debug
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/mxml.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/mxml.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads
     $(MAKE) -C '$(1)' -j '$(JOBS)' libmxml.a
--- a/src/ncurses.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/ncurses.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -30,6 +30,6 @@
         --without-manpages \
         --enable-pc-files \
         --with-normal \
-        --without-shared
+        $(WITH_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/nettle.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/nettle.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/ogg.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/ogg.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/opencore-amr.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/opencore-amr.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/openexr.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/openexr.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -24,7 +24,7 @@
     echo 'echo $1' > '$(1)/$(ilmbase_SUBDIR)/config.sub'
     cd '$(1)/$(ilmbase_SUBDIR)' && $(SHELL) ./configure \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(1)/ilmbase' \
         --enable-threading=no \
         --disable-posix-sem \
@@ -34,7 +34,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-threading \
         --disable-posix-sem \
--- a/src/pango.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/pango.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-gtk-doc \
         --without-x \
--- a/src/pangomm.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/pangomm.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/pcre.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/pcre.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -22,7 +22,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-pcre16 \
         --enable-utf \
--- a/src/pdflib_lite.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/pdflib_lite.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-openssl \
         --without-java \
--- a/src/pfstools.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/pfstools.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-netpbm \
         --disable-openexr \
         --disable-tiff \
--- a/src/pixman.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/pixman.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/plibc.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/plibc.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,6 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --enable-static \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/plotmm.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/plotmm.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install \
         bin_PROGRAMS= \
         sbin_PROGRAMS= \
--- a/src/plotutils.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/plotutils.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --enable-libplotter \
         --enable-libxmi \
         --with-png \
--- a/src/poppler.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/poppler.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -25,8 +25,7 @@
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-silent-rules \
-        --disable-shared \
-        --enable-static \
+        $(ENABLE_SHARED_OR_STATIC) \
         --enable-xpdf-headers \
         --enable-poppler-qt4 \
         --enable-zlib \
--- a/src/popt.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/popt.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-nls
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/portaudio.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/portaudio.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-host_os=mingw \
         --with-winapi=wmme,directx,wasapi,wdmks \
--- a/src/postgresql.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/postgresql.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -26,7 +26,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-rpath \
         --without-tcl \
         --without-perl \
@@ -53,7 +53,7 @@
     $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile
     cd '$(1).native' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-rpath \
         --without-tcl \
         --without-perl \
--- a/src/proj.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/proj.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-mutex
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/protobuf.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/protobuf.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
 # First step: Build for host system in order to create "protoc" binary.
     cd '$(1)' && ./configure \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     cp '$(1)/src/protoc' '$(1)/src/protoc_host'
     $(MAKE) -C '$(1)' -j 1 distclean
@@ -26,7 +26,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --with-zlib \
         --with-protoc=src/protoc_host
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/readline.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/readline.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,11 +21,11 @@
     $(SED) -i 's,^ *case SIGTSTP:.*,,' '$(1)/signals.c'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-multibyte \
         --without-purify \
         --with-curses \
         LIBS='-lpdcurses'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install SHARED_LIBS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/sdl.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sdl.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     $(SED) -i 's,-mwindows,-lwinmm -mwindows,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads \
         --enable-directx \
--- a/src/sdl_image.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sdl_image.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     $(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng,' '$(1)/SDL_image.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
--- a/src/sdl_mixer.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sdl_mixer.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -25,7 +25,7 @@
     $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
--- a/src/sdl_net.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sdl_net.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
--- a/src/sdl_pango.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sdl_pango.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     $(SED) -i 's,^\(Requires:.*\),\1 pangoft2,' '$(1)/SDL_Pango.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
--- a/src/sdl_sound.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sdl_sound.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
--- a/src/sdl_ttf.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sdl_ttf.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
--- a/src/smpeg.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/smpeg.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
         AR='$(TARGET)-ar' \
         NM='$(TARGET)-nm' \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
--- a/src/sox.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sox.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -27,7 +27,7 @@
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared
+        $(ENABLE_SHARED_OR_STATIC)
 
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install
--- a/src/speex.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/speex.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-oggtest
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= doc_DATA=
--- a/src/sqlite.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/sqlite.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-readline \
         --disable-threadsafe
--- a/src/t4k_common.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/t4k_common.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdlpango \
         --with-sdlnet \
--- a/src/theora.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/theora.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_DATA=
 endef
--- a/src/tiff.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/tiff.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-x
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/tre.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/tre.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/vorbis.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/vorbis.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         PKG_CONFIG='$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/wxwidgets.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/wxwidgets.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-compat24 \
         --enable-compat26 \
@@ -70,7 +70,7 @@
     cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-compat24 \
         --enable-compat26 \
--- a/src/x264.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/x264.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,8 +18,7 @@
         --cross-prefix='$(TARGET)'- \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
-        --enable-static \
+        $(ENABLE_SHARED_OR_STATIC) \
         --enable-win32thread
     $(MAKE) -C '$(1)' -j 1 uninstall
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/xapian-core.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/xapian-core.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,6 +20,6 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --enable-static
+        $(ENABLE_SHARED_OR_STATC)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/xerces.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/xerces.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && CONFIG_SHELL='$(SHELL)' ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-sse2 \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-libtool-lock \
--- a/src/xine-lib.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/xine-lib.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -25,8 +25,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --enable-static \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-mmap \
         --disable-nls \
         --disable-aalib \
--- a/src/xmlwrapp.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/xmlwrapp.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -18,7 +18,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         PKG_CONFIG='$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
--- a/src/xz.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/xz.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -20,7 +20,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-threads \
         --disable-nls
     $(MAKE) -C '$(1)'/src/liblzma -j '$(JOBS)' install
--- a/src/zlib.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/zlib.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -9,6 +9,9 @@
 $(PKG)_URL      := http://zlib.net/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://$(SOURCEFORGE_MIRROR)/project/libpng/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
+ifneq ($(BUILD_SHARED),yes)
+$(PKG)_STATIC_FLAG := -static
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://zlib.net/' | \
@@ -19,6 +22,6 @@
 define $(PKG)_BUILD
     cd '$(1)' && CHOST='$(TARGET)' ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --static
+        $($(PKG)_STATIC_FLAG)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/zziplib.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/zziplib.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -21,7 +21,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-mmap \
-        --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         PKG_CONFIG='$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=