Change freetype libs order to fix win32 compile

(cherry picked from commit 8e587b3f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

configure.ac

@@ -4317,11 +4317,11 @@ then
       VLC_ADD_PLUGIN([freetype])
       have_freetype=yes
       VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
-      VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
       if test "${SYS}" = "mingw32"; then
         VLC_ADD_LIBS([freetype skins2],[-lxml2])
-        VLC_ADD_LIBS([freetype],[-liconv])
+        VLC_ADD_LIBS([freetype],[-liconv -lz])
       fi
+      VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
       if test "${enable_fontconfig}" != "no"
       then
         AC_CHECK_HEADERS(fontconfig/fontconfig.h,
@@ -4330,14 +4330,6 @@ then
         AC_CHECK_HEADERS(Carbon/Carbon.h,
           [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
       fi
-  ],[
-  have_freetype=no
-  AS_IF([ test "${enable_freetype}" =  "yes"],[
-    AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
-from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
-      ])
-    ])
-  ])
 
      dnl fribidi support
       if test "${enable_fribidi}" != "no"
@@ -4347,6 +4339,16 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
           VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
         ])
       fi
+
+  ],[
+  have_freetype=no
+  AS_IF([ test "${enable_freetype}" =  "yes"],[
+    AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
+from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
+      ])
+    ])
+  ])
+
 fi
 
 dnl