diff --git a/aegisub/configure.in b/aegisub/configure.in index eefb72155..511a60f88 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -794,22 +794,6 @@ AC_SUBST(LIBASS_CFLAGS) -AC_ARG_ENABLE(csri, [ --enable-csri enable CSRI (ASA) support THIS IS BROKEN - (default=disabled)]) - -if test "$enable_csri" = "yes"; then - PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, with_csri="yes", with_csri="no") - PKG_CHECK_MODULES(ASA, asa >= 0.3.2, with_asa="yes", with_asa="no") - if test "$with_csri" = "yes" && test "$with_asa" = "yes"; then - AC_DEFINE(WITH_CSRI, 1, [Enable CSRI (ASA) Subtitle Provider]) - fi -else - with_csri="no" -fi - -AM_CONDITIONAL([WITH_CSRI], [test "$with_csri" = "yes"]) - - ########### ## Hunspell ########### @@ -1363,8 +1347,6 @@ if ! test -z "$with_provider_subtitle"; then else if test "$with_libass" = "yes"; then default_provider_subtitle="libass" - elif test "$with_csri" = "yes"; then - default_provider_subtitle="csri" fi fi AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_SUBTITLE], ["$default_provider_subtitle"], [Default Subtitle Provider.]) @@ -1510,9 +1492,8 @@ A/V Providers FFmpegSource: $with_provider_ffmpegsource $ffmpegsource_provider_disabled Subtitle Providers: - CSRI (ASA): $with_csri $csri_disabled $csri_default libASS $with_libass $libass_disabled $libass_default - (both require iconv and fontconfig) + (requires iconv and fontconfig) Misc Packages Hunspell: $with_hunspell $with_hunspell_version $hunspell_disabled diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am index e6833424a..27e2800d2 100644 --- a/aegisub/src/Makefile.am +++ b/aegisub/src/Makefile.am @@ -104,7 +104,6 @@ endif noinst_LIBRARIES += libsubtitle_provider.a libsubtitle_provider_a_SOURCES = subtitles_provider.cpp -libsubtitle_provider_a_CPPFLAGS = @CSRI_CFLAGS@ aegisub_2_1_LDADD += libsubtitle_provider.a if WITH_LIBASS @@ -115,14 +114,6 @@ LIBS += @LIBASS_LIBS@ aegisub_2_1_LDADD += libsubtitle_ass.a @FONTCONFIG_LIBS@ endif -if WITH_CSRI -noinst_LIBRARIES += libsubtitle_csri.a -libsubtitle_csri_a_SOURCES = subtitles_provider_csri.cpp -libsubtitle_csri_a_CPPFLAGS = @ICONV_CFLAGS@ @CSRI_CFLAGS@ -LIBS += @CSRI_LIBS@ -aegisub_2_1_LDADD += libsubtitle_csri.a @FONTCONFIG_LIBS@ -endif - if HAVE_AUTO4_LUA noinst_LIBRARIES += libauto4_lua.a libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp