[vlc-devel] commit: Libass: simplify configure.ac (Jean-Baptiste Kempf )

git version control git at videolan.org
Mon Oct 26 22:23:57 CET 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Oct 26 12:12:34 2009 +0100| [189e0e3900e208adc0f94228af70c26857e12458] | committer: Jean-Baptiste Kempf 

Libass: simplify configure.ac

This is now working since the previous "--static" commit

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

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

diff --git a/configure.ac b/configure.ac
index 113575f..d3b9c8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])




More information about the vlc-devel mailing list