1--- SDL_mixer-1.2.12/configure	2012-01-06 05:12:02.000000000 +0100
2+++ SDL_mixer-1.2.12/configure	2012-01-06 10:38:59.000000000 +0100
3@@ -11540,17 +11540,8 @@
4 done
5
6
7-case "$host" in
8-    *-*-cygwin*)
9-        # We build SDL on cygwin without the UNIX emulation layer
10-        BASE_CFLAGS="-I/usr/include/mingw -mno-cygwin"
11-        BASE_LDFLAGS="-mno-cygwin"
12-        ;;
13-    *)
14-        BASE_CFLAGS="-D_GNU_SOURCE=1"
15-        BASE_LDFLAGS=""
16-        ;;
17-esac
18+BASE_CFLAGS="-D_GNU_SOURCE=1"
19+BASE_LDFLAGS=""
20 BUILD_CFLAGS="$CFLAGS $CPPFLAGS"
21 EXTRA_CFLAGS="$INCLUDE $BASE_CFLAGS"
22 BUILD_LDFLAGS="$LDFLAGS"
23@@ -11848,6 +11839,7 @@
24 find_lib()
25 {
26     gcc_bin_path=`$CC -print-search-dirs 2>/dev/null | fgrep programs: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`
27+    env_bin_path=[`echo $PATH | sed 's/:/ /g'`]
28     gcc_lib_path=`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`
29     env_lib_path=`echo $LIBS $LDFLAGS $* | sed 's/-L[ ]*//g'`
30     if test "$cross_compiling" = yes; then
31@@ -11855,7 +11847,7 @@
32     else
33         host_lib_path="/usr/$base_libdir /usr/local/$base_libdir"
34     fi
35-    for path in $gcc_bin_path $gcc_lib_path $env_lib_path $host_lib_path; do
36+    for path in $gcc_bin_path $env_bin_path $gcc_lib_path $env_lib_path $host_lib_path; do
37         lib=`ls -- $path/$1 2>/dev/null | sort | sed 's/.*\/\(.*\)/\1/; q'`
38         if test x$lib != x; then
39             echo $lib
40@@ -12727,7 +12719,10 @@
41             *-*-darwin*)
42                 mikmod_lib=`find_lib libmikmod.dylib`
43                 ;;
44-            *-*-cygwin* | *-*-mingw32*)
45+            *-*-cygwin*)
46+                mikmod_lib=[`find_lib "cygmikmod-*.dll"`]
47+                ;;
48+            *-*-mingw32*)
49                 mikmod_lib=`find_lib "mikmod*.dll"`
50                 ;;
51             *)
52@@ -13415,7 +13410,10 @@
53                         ogg_lib=`find_lib libvorbisidec.[0-9]*`
54                     fi
55                     ;;
56-                *-*-cygwin* | *-*-mingw32*)
57+                *-*-cygwin*)
58+                    ogg_lib=[`find_lib "cygvorbisidec-*.dll"`]
59+                    ;;
60+                *-*-mingw32*)
61                     ogg_lib=`find_lib "vorbisidec*.dll"`
62                     ;;
63                 *)
64@@ -13640,7 +13638,10 @@
65                 *-*-darwin*)
66                     ogg_lib=`find_lib libvorbisfile.dylib`
67                     ;;
68-                *-*-cygwin* | *-*-mingw32*)
69+                *-*-cygwin*)
70+                    ogg_lib=[`find_lib "cygvorbisfile-*.dll"`]
71+                    ;;
72+                *-*-mingw32*)
73                     ogg_lib=`find_lib "libvorbisfile*.dll"`
74                     ;;
75                 *)
76@@ -14073,8 +14074,10 @@
77                 *-*-darwin*)
78                     flac_lib=`find_lib libFLAC.dylib`
79                     ;;
80-                *-*-cygwin* | *-*-mingw32*)
81-                    flac_lib=`find_lib "libFLAC*.dll"`
82+                *-*-cygwin*)
83+                    flac_lib=[`find_lib "cygFLAC-*.dll"`]
84+                    ;;
85+                *-*-mingw32*)                    flac_lib=`find_lib "libFLAC*.dll"`
86                     ;;
87                 *)
88                     flac_lib=`find_lib "libFLAC.so.[0-9]"`
89@@ -14649,7 +14652,10 @@
90             *-*-darwin*)
91                 smpeg_lib=`find_lib libsmpeg.dylib`
92                 ;;
93-            *-*-cygwin* | *-*-mingw32*)
94+            *-*-cygwin*)
95+                smpeg_lib=[`find_lib "cygsmpeg-*.dll"`]
96+                ;;
97+            *-*-mingw32*)
98                 smpeg_lib=`find_lib "smpeg*.dll"`
99                 ;;
100             *)
101