]> git.sesse.net Git - vlc/commitdiff
Libass: simplify configure.ac
authorJean-Baptiste Kempf <jb@videolan.org>
Mon, 26 Oct 2009 11:12:34 +0000 (12:12 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 26 Oct 2009 21:14:50 +0000 (22:14 +0100)
This is now working since the previous "--static" commit

configure.ac

index 113575f55845d8510b93026e1dc4daedcfa0cc31..d3b9c8bfdc87b6837fb60aceca41773d5084d929 100644 (file)
@@ -3466,17 +3466,13 @@ AC_ARG_ENABLE(libass,
 AS_IF( [test "${enable_libass}" = "yes"], [
   PKG_CHECK_MODULES(LIBASS, libass >= 0.9.6,
       [
-        VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS])
+        VLC_ADD_LIBS([libass],[$LIBASS_LIBS])
         VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
         VLC_ADD_PLUGIN([libass])
 
         AC_CHECK_HEADERS(fontconfig/fontconfig.h,
           [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
-        if test "${SYS}" = "mingw32"; then
-           VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz])
-        else
            VLC_ADD_LIBS([libass],[-lfontconfig])
-        fi
        ])
       ],[
         AC_MSG_WARN([LIBASS library not found])