[vlc-devel] commit: Temporary Hack to fix compile on Win32. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 11 18:15:55 2008 -0700| [640f7e7049f1b7dd0106b85bc1104652c3fbbcc3] | committer: Jean-Baptiste Kempf 

Temporary Hack to fix compile on Win32.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=640f7e7049f1b7dd0106b85bc1104652c3fbbcc3
---

 configure.ac |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index b9bc30e..1691b3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3779,9 +3779,12 @@ AS_IF( [test "${enable_libass}" = "yes"], [
         VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
         VLC_ADD_PLUGIN([libass])
 
-		AC_CHECK_HEADERS(fontconfig/fontconfig.h,
-		  [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
-		   VLC_ADD_LIBS([libass],[-lfontconfig])])
+        AC_CHECK_HEADERS(fontconfig/fontconfig.h,
+          [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
+           VLC_ADD_LIBS([libass],[-lfontconfig])])
+        if test "${SYS}" = "mingw32"; then
+          VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv  -lxml2])
+        fi
       ],[
         AC_MSG_WARN([LIBASS library not found])
       ])
@@ -4158,7 +4161,10 @@ then
       VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
       if test "${SYS}" = "mingw32"; then
         VLC_ADD_LIBS([freetype skins2],[-lxml2])
-     fi
+      fi
+      if test "${SYS}" = "mingw32"; then
+        VLC_ADD_LIBS([freetype],[-liconv])
+      fi
     AC_CHECK_HEADERS(fontconfig/fontconfig.h,
       [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
        VLC_ADD_LIBS([freetype],[-lfontconfig])])