vlc | branch: master | Daniel Mierswa <[email protected]> | Fri Aug 27 09:02:35 2010 +0200| [9eb3ee78e61e26b066b0564bbf135a378990287f] | committer: Jean-Baptiste Kempf
remove references to removed asademux code 62487ef428d02953eaae1c879655d714f38c8562 removed asademux code but not all references to it vanished Signed-off-by: Daniel Mierswa <[email protected]> Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9eb3ee78e61e26b066b0564bbf135a378990287f --- configure.ac | 22 ---------------------- projects/macosx/framework/Configure.sh | 1 - 2 files changed, 0 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 1567851..e9b6fef 100644 --- 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" @@ -3084,26 +3082,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 AC_ARG_ENABLE(kate, diff --git a/projects/macosx/framework/Configure.sh b/projects/macosx/framework/Configure.sh index ed379e4..45ce60c 100644 --- 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" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
