[vlc-devel] commit: Try (again!) to fix win32 libass compilation (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at altair.videolan.org> | Tue Aug 12 22:44:08 2008 +0200| [897ae9cac232ac3aab3ee987f48b54467d08a906] | committer: Jean-Baptiste Kempf 

Try (again!) to fix win32 libass compilation

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

 configure.ac |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1691b3c..24c814a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3772,8 +3772,7 @@ dnl
 AC_ARG_ENABLE(libass,
   [  --enable-libass           Subtitle support using libass (default disabled)])
 AS_IF( [test "${enable_libass}" = "yes"], [
-  PKG_CHECK_MODULES(LIBASS,
-      libass >= 0.9.5,
+  PKG_CHECK_MODULES(LIBASS, libass >= 0.9.5,
       [
         VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS])
         VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
@@ -3781,10 +3780,12 @@ AS_IF( [test "${enable_libass}" = "yes"], [
 
         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])
+           VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv  -lxml2])
+        else
+           VLC_ADD_LIBS([libass],[-lfontconfig])
         fi
+       ])
       ],[
         AC_MSG_WARN([LIBASS library not found])
       ])