remove references to removed asademux code

62487ef428d02953eaae1c879655d714f38c8562 removed asademux code but not
all references to it vanished

Signed-off-by: Daniel Mierswa <impulze@impulze.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/configure.ac b/configure.ac
index 1567851d94b228dc89986e2a52f8959c12b939d7..e9b6feffee6f4f432f2848c6b956a5555d0ac6bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -256,8 +256,6 @@ case "${host_os}" in
         echo "  Assuming --enable-realrtsp"
         enable_libass="yes"
         echo "  Assuming --enable-libass"
-        enable_asademux="yes"
-        echo "  Assuming --enable-asademux"
 
         enable_skins2="no"
         echo "  Assuming --disable-skins2"
@@ -3083,26 +3081,6 @@ AS_IF( [test "${enable_libass}" != "no"], [
       ])
   ])
 
-dnl
-dnl asa demuxer
-dnl
-AC_ARG_ENABLE(asademux,
-  [  --enable-asademux       asa subtitle demuxing (default disabled)])
-AS_IF( [test "${enable_asademux}" = "yes"], [
-  PKG_CHECK_MODULES(PCRE,
-      libpcre >= 6.5,
-      [
-        VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS])
-        VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS])
-        if test "${SYS}" = "mingw32"; then
-            VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC])
-        fi
-        VLC_ADD_PLUGIN([asademux])
-      ],[
-        AC_MSG_WARN([PCRE library not found (required for asademux)])
-      ])
-  ])
-
 dnl
 dnl  kate decoder plugin
 dnl

diff --git a/projects/macosx/framework/Configure.sh b/projects/macosx/framework/Configure.sh
index ed379e4daf25e52e35c6d9865ca37a534b59a110..45ce60cf3bc378f7f0fbf223c3e24990bba3a220 100644 (file)
--- a/projects/macosx/framework/Configure.sh
+++ b/projects/macosx/framework/Configure.sh
@@ -40,7 +40,6 @@ args="--enable-vcdx $args"
 args="--enable-twolame $args"
 args="--enable-realrtsp $args"
 args="--enable-libass $args"
-args="--enable-asademux $args"
 
 # disabled stuff
 args="--disable-ncurses $args"