[mingw] Some more tweaks

It now survives ./config.status --recheck as well.

https://github.com/harfbuzz/harfbuzz/issues/1728

mingw-configure.sh

@@ -8,22 +8,21 @@ esac
 target=$1-w64-mingw32
 shift
 
-unset CC
+exec "$(dirname "$0")"/configure \
-unset CXX
+	--build=`../config.guess` \
-unset CPP
+	--host=$target \
-unset LD
+	--prefix=$HOME/.local/$target \
-unset LDFLAGS
+	CC= \
-unset CFLAGS
+	CXX= \
-unset CXXFLAGS
+	CPP= \
-unset PKG_CONFIG_PATH
+	LD= \
-
+	CFLAGS="-static-libgcc" \
-# Removed -static from the following
+	CXXFLAGS="-static-libgcc -static-libstdc++" \
-export CFLAGS="-static-libgcc"
+	CPPFLAGS="-I$HOME/.local/$target/include" \
-export CXXFLAGS="-static-libgcc -static-libstdc++"
+	LDFLAGS=-L$HOME/.local/$target/lib \
-export CPPFLAGS="-I$HOME/.local/$target/include"
+	PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig:/usr/$target/sys-root/mingw/lib/pkgconfig/ \
-export LDFLAGS=-L$HOME/.local/$target/lib
+	PKG_CONFIG_PATH=$HOME/.local/$target/share/pkgconfig:/usr/$target/sys-root/mingw/share/pkgconfig/ \
-export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig:/usr/$target/sys-root/mingw/lib/pkgconfig/
+	PATH=$HOME/.local/$target/bin:/usr/$target/sys-root/mingw/bin:/usr/$target/bin:$PATH \
-export PKG_CONFIG_PATH=$HOME/.local/$target/share/pkgconfig:/usr/$target/sys-root/mingw/share/pkgconfig/
+	--without-icu \
-export PATH=$HOME/.local/$target/bin:/usr/$target/sys-root/mingw/bin:/usr/$target/bin:$PATH
+	--with-uniscribe \
-
+	"$@"
-../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target --with-uniscribe --without-icu "$@"

mingw32.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec "`dirname "$0"`/mingw-configure.sh" i686 "$@"
+exec "$(dirname "$0")"/mingw-configure.sh i686 "$@"

mingw64.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec "`dirname "$0"`/mingw-configure.sh" x86_64 "$@"
+exec "$(dirname "$0")"/mingw-configure.sh x86_64 "$@"