iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove CSRI support from Unix builds 

Originally committed to SVN as r5545.
This commit is contained in:
Niels Martin Hansen 2011-08-20 16:06:42 +00:00
parent 491fb85657
commit a478750cde
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
aegisub/configure.in
View File

@ -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 ## Hunspell
########### ###########
@ -1363,8 +1347,6 @@ if ! test -z "$with_provider_subtitle"; then
else else
if test "$with_libass" = "yes"; then if test "$with_libass" = "yes"; then
default_provider_subtitle="libass" default_provider_subtitle="libass"
elif test "$with_csri" = "yes"; then
default_provider_subtitle="csri"
fi fi
fi fi
AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_SUBTITLE], ["$default_provider_subtitle"], [Default Subtitle Provider.]) 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 FFmpegSource: $with_provider_ffmpegsource $ffmpegsource_provider_disabled
Subtitle Providers: Subtitle Providers:
CSRI (ASA): $with_csri $csri_disabled $csri_default
libASS $with_libass $libass_disabled $libass_default libASS $with_libass $libass_disabled $libass_default
(both require iconv and fontconfig) (requires iconv and fontconfig)
Misc Packages Misc Packages
Hunspell: $with_hunspell $with_hunspell_version $hunspell_disabled Hunspell: $with_hunspell $with_hunspell_version $hunspell_disabled

9
aegisub/src/Makefile.am
View File

@ -104,7 +104,6 @@ endif
noinst_LIBRARIES += libsubtitle_provider.a noinst_LIBRARIES += libsubtitle_provider.a
libsubtitle_provider_a_SOURCES = subtitles_provider.cpp libsubtitle_provider_a_SOURCES = subtitles_provider.cpp
libsubtitle_provider_a_CPPFLAGS = @CSRI_CFLAGS@
aegisub_2_1_LDADD += libsubtitle_provider.a aegisub_2_1_LDADD += libsubtitle_provider.a
if WITH_LIBASS if WITH_LIBASS
@ -115,14 +114,6 @@ LIBS += @LIBASS_LIBS@
aegisub_2_1_LDADD += libsubtitle_ass.a @FONTCONFIG_LIBS@ aegisub_2_1_LDADD += libsubtitle_ass.a @FONTCONFIG_LIBS@
endif 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 if HAVE_AUTO4_LUA
noinst_LIBRARIES += libauto4_lua.a noinst_LIBRARIES += libauto4_lua.a
libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp