Try (again!) to fix win32 libass compilation

897ae9ca · Jean-Baptiste Kempf · e657d0dc · 897ae9ca
Commit 897ae9ca authored Aug 12, 2008 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

configure.ac configure.ac +5 -4

No files found.
--- 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])
      ])