X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=acd04688757f5ea773b9bebcbbf86c91f14275db;hb=0392f8be2186d67ae86e9fdc1f809af34e623352;hp=e504d083be0cecc177ddade712b74e847f7ce5a5;hpb=283b125f4ac0ba3fcd6398f1da522557356831e9;p=vlc

diff --git a/configure.ac b/configure.ac
index e504d083be..acd0468875 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1802,7 +1802,7 @@ dnl
 AC_ARG_ENABLE(taglib,
   [  --disable-taglib        Taglib support (default enabled) ])
   AS_IF([test "${enable_taglib}" != "no"],[
-    PKG_CHECK_MODULES(TAGLIB, taglib,
+    PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5,
       [ AC_DEFINE( HAVE_TAGLIB, 1, [Define if you have taglib plugin built] )
         VLC_ADD_PLUGIN([taglib])
         VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz])
@@ -4276,8 +4276,6 @@ then
       VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
       if test "${SYS}" = "mingw32"; then
         VLC_ADD_LIBS([freetype skins2],[-lxml2])
-      fi
-      if test "${SYS}" = "mingw32"; then
         VLC_ADD_LIBS([freetype],[-liconv])
       fi
       if test "${enable_fontconfig}" != "no"
@@ -4312,41 +4310,17 @@ dnl  libxml2 module
 dnl
 AC_ARG_ENABLE(libxml2,
   [  --enable-libxml2        libxml2 support (default enabled)])
-if test "${enable_libxml2}" != "no"
-then
-  XML2_PATH="${PATH}"
-  AC_ARG_WITH(xml2-config-path,
-    [    --with-xml2-config-path=PATH xml2-config path (default search in \$PATH)],
-    [ if test "${with_xml2_config_path}" != "no"; then
-        XML2_PATH="${with_xml2_config_path}:${PATH}"
-      fi ])
-  AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH})
-  if test "${XML2_CONFIG}" != "no"; then
-    VLC_ADD_CPPFLAGS([xml],[`${XML2_CONFIG} --cflags`])
-    VLC_ADD_LIBS([xml],[`${XML2_CONFIG} --libs`])
-    dnl depends on the xmlTextReader extension
-    CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xml}"
-    LDFLAGS="${LDFLAGS_save} ${LIBS_xml}"
-    AC_CHECK_LIB(xml2,xmlTextReaderConstName,[
-      AC_EGREP_HEADER(xmlTextReaderConstName,libxml/xmlreader.h,[
-        VLC_ADD_PLUGIN([xml]) ],[
-          AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version])
-          if test "${enable_xml2}" = "yes"; then
-            AC_MSG_ERROR([libxml2 missing the xmlTextReader extension])
-          fi])
-       ],[
-      AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version])
-      if test "${enable_xml2}" = "yes"; then
-        AC_MSG_ERROR([libxml2 missing the xmlTextReader extension])
-      fi])
-    LDFLAGS="${LDFLAGS_save}"
-    CPPFLAGS="${CPPFLAGS_save}"
-  else
-    if test "${enable_xml2}" = "yes"; then
-      AC_MSG_ERROR([Could not find libxml2])
-    fi
-  fi
-fi
+AS_IF([test "${enable_libxml2}" != "no"], [
+  PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.5], [
+    VLC_ADD_CPPFLAGS([xml],[${XML2_CFLAGS}])
+    VLC_ADD_LIBS([xml],[${XML2_LIBS}])
+    VLC_ADD_PLUGIN([xml])
+  ], [
+    AS_IF([test "x${enable_xml2}" != "x"], [
+      AC_MSG_ERROR([Could not find libxml version 2.5 or higher])
+    ])
+  ])
+])
 
 dnl
 dnl  SVG module
@@ -5851,6 +5825,7 @@ AC_SUBST(VERSION_MESSAGE)
 AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_REVISION)
+AC_SUBST(VERSION_EXTRA)
 AC_SUBST(COPYRIGHT_YEARS)
 AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
 if test "${build_os}" = "cygwin"
@@ -5933,6 +5908,7 @@ AC_CONFIG_FILES([
   projects/activex/axvlc_rc.rc
   projects/mozilla/npvlc_rc.rc
   projects/mozilla/vlc.r
+  projects/mozilla/install.js
   share/Makefile
   share/vlc_win32_rc.rc
   share/libvlc_win32_rc.rc