configure: updates for recent MXE

Makefile.in

@@ -18,9 +18,6 @@ CMAKE_ARGS := -DCMAKE_INSTALL_PREFIX=$(USR)
 ifeq (@MXE_CROSS@,yes)
 CMAKE_ARGS += -DCMAKE_TOOLCHAIN_FILE=@MXE_CMAKE_TOOLCHAIN_FILE@
 endif
-ifeq (@P3P_BUILD_STATIC@,yes)
-CMAKE_ARGS += -DBUILD_STATIC_LIB=ON
-endif
 
 all: $(PACKAGES)
 

configure.ac

@@ -2,9 +2,6 @@ dnl setup
 AC_PREREQ(2.59)
 AC_INIT([pioneer-thirdparty], [0.1], [[email protected]])
 
-dnl static linking
-AC_ARG_ENABLE([static], AS_HELP_STRING([--enable-static], [Build libs for static linking]), [P3P_BUILD_STATIC=$enableval], [P3P_BUILD_STATIC=])
-
 dnl detect and setup mxe
 AC_DEFUN([MXE_SETUP], [
     AC_ARG_WITH([mxe], AS_HELP_STRING([--with-mxe], [Path to MXE MinGW environment for cross-building]), [MXE_BASE=$withval], [MXE_BASE=])
@@ -15,7 +12,7 @@ AC_DEFUN([MXE_SETUP], [
 			AC_MSG_ERROR([Cannot specify --host with --with-mxe])
 		fi
 		AC_MSG_CHECKING([for MXE])
-		MXE_CMAKE_TOOLCHAIN_FILE="$MXE_BASE/usr/i686-pc-mingw32/share/cmake/mxe-conf.cmake"
+		MXE_CMAKE_TOOLCHAIN_FILE="$MXE_BASE/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake"
 		if ! test -f "$MXE_CMAKE_TOOLCHAIN_FILE" ; then
 			AC_MSG_RESULT([no])
 			AC_MSG_ERROR([MXE not found in $MXE_BASE])
@@ -25,9 +22,9 @@ AC_DEFUN([MXE_SETUP], [
 		MXE_PATH="$MXE_BASE/usr/bin"
 		PATH="$MXE_PATH:$PATH"
 		host_alias=i686-pc-mingw32
+		host_alias=i686-w64-mingw32.static
 		ac_tool_prefix=$host_alias-
 		cross_compiling=yes
-		P3P_BUILD_STATIC=yes
 	fi
 	AC_SUBST(MXE_BASE)
 	AC_SUBST(MXE_CROSS)
@@ -37,8 +34,6 @@ AC_DEFUN([MXE_SETUP], [
 
 MXE_SETUP
 
-AC_SUBST(P3P_BUILD_STATIC)
-
 dnl normalise build and host triples
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST