From af5df13f0089a53d67a7881df3efa0f06eb196cc Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 23 Jul 2009 01:23:35 +0000 Subject: [PATCH] Remove Auto4 Ruby from the (unix) build system, updates #665 and #938. Originally committed to SVN as r3204. --- aegisub/automation/Makefile.am | 16 +------- aegisub/configure.in | 71 ---------------------------------- aegisub/src/Makefile.am | 11 ------ 3 files changed, 1 insertion(+), 97 deletions(-) diff --git a/aegisub/automation/Makefile.am b/aegisub/automation/Makefile.am index 6df42110c..939466699 100644 --- a/aegisub/automation/Makefile.am +++ b/aegisub/automation/Makefile.am @@ -21,10 +21,6 @@ data_auto4_lua = \ include/utils-auto4.lua \ include/utils.lua -data_auto4_ruby = \ - include/karaoke.rb \ - include/utils.rb - # share/doc @@ -43,9 +39,6 @@ data_auto4_lua_doc = \ demos/future-windy-blur.lua \ demos/raytracer.lua -data_auto4_ruby_doc = \ - demos/k-replacer.rb - nobase_share_doc_DATA = nobase_automation_DATA = @@ -60,16 +53,9 @@ nobase_automation_DATA += $(data_auto4_lua) nobase_share_doc_DATA += $(data_auto4_lua_doc) endif -if HAVE_AUTO4_RUBY -nobase_automation_DATA += $(data_auto4_ruby) -nobase_share_doc_DATA += $(data_auto4_ruby_doc) -endif - EXTRA_DIST = \ $(data_general) \ $(data_auto4_lua) \ - $(data_auto4_ruby) \ $(data_general_doc) \ - $(data_auto4_lua_doc) \ - $(data_auto4_ruby_doc) + $(data_auto4_lua_doc) diff --git a/aegisub/configure.in b/aegisub/configure.in index f7dc2a220..919e566ed 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -26,7 +26,6 @@ m4_define([pulseaudio_required_version], [0.5]) m4_define([fontconfig_required_version], [2.4]) m4_define([freetype_required_version], [9.7.0]) m4_define([pkgconfig_required_version], [0.20]) -m4_define([ruby_required_version], [1.8]) m4_define([wx_required_version], [2.8.1]) @@ -761,10 +760,6 @@ AM_CONDITIONAL([HAVE_UNIVCHARDET], [test "$with_univchardet" != "no"]) # Automation ############ -############ -## Auto4 LUA -############ - AC_ARG_WITH(lua, [ --without-lua build without lua 5.1 (auto4)], [lua51_disabled="(disabled)"]) @@ -806,72 +801,6 @@ AM_CONDITIONAL([HAVE_AUTO4_LUA], [test "$with_auto4" != "no"]) AC_SUBST(LUA_CFLAGS) AC_SUBST(LUA_LDFLAGS) - -############# -## Auto4 Ruby -############# -AC_ARG_WITH(ruby, [ --without-ruby build without Ruby Automation. (default: auto)], ruby_disabled="(disabled)") -AC_ARG_WITH(ruby-bin, [ --with-ruby-bin=PATH location of RUBY binary. (default: $PATH)], [WITH_RUBY_BIN="$withval"]) - -AC_ARG_VAR([RUBY_CFLAGS], [CFLAGS to use for Ruby (default: Config::CONFIG archdir + CFLAGS)]) -AC_ARG_VAR([RUBY_LDFLAGS], [LDFLAGS to use for Ruby (default: Cofig::CONFIG LIBRUBYARG)]) - -if test "$with_ruby" != "no"; then - if test -z "$WITH_RUBY_BIN"; then - AC_PATH_PROG([RUBY_BIN],ruby,no) - else - RUBY_BIN="$WITH_RUBY_BIN" - fi - - - if test "$RUBY_BIN" != "no"; then - AC_CACHE_CHECK( - [checking for ruby version >= ruby_required_version], [with_cv_ruby], - [if $RUBY_BIN -r rbconfig -e 'if Config::CONFIG@<:@"ruby_version"@:>@.to_f >= ruby_required_version then exit(0) else exit(1) end'; then - with_cv_ruby="yes"; else with_cv_ruby="no"; fi]) - - if test "$with_cv_ruby" = "yes"; then - AC_MSG_CHECKING([checking $RUBY_BIN -r rbconfig archdir, cflags]) - if test -z "$RUBY_CFLAGS"; then - RUBY_CFLAGS=`$RUBY_BIN -r rbconfig -e "printf(\"-I%s %s\", Config::CONFIG@<:@'archdir'@:>@, Config::CONFIG@<:@'CFLAGS'@:>@)"` - fi - AC_MSG_RESULT([$RUBY_CFLAGS]) - - AC_MSG_CHECKING([checking $RUBY_BIN rbconfig libs]) - if test -z "$RUBY_LDFLAGS"; then - RUBY_LDFLAGS=`$RUBY_BIN -r rbconfig -e "print Config::CONFIG@<:@'LIBRUBYARG'@:>@"` - fi - AC_MSG_RESULT([$RUBY_LDFLAGS]) - - AC_AGI_COMPILE([Ruby], [ruby], [$RUBY_CFLAGS], [$RUBY_LDFLAGS],[ -#include -int main(void) { - /* These supposidly call exit if they fail. */ - ruby_init(); - ruby_init_loadpath(); - return 0; -}]) - fi - fi -fi - -if test "$agi_cv_with_ruby" = "no" && test "$with_cv_ruby" = "yes"; then - AC_MSG_WARN([Ruby detected, but it doesn't work...]) - with_cv_ruby="no" -fi - -if test "$agi_cv_with_ruby" = "yes" && test "$with_cv_ruby" = "yes"; then - with_automation="yes" - AC_DEFINE(WITH_RUBY, 1, [Enable RUBY Automation.]) -else - with_cv_ruby="no" -fi - -AM_CONDITIONAL([HAVE_AUTO4_RUBY], [test "$with_cv_ruby" != "no"]) -AC_SUBST(RUBY_CFLAGS) -AC_SUBST(RUBY_LDFLAGS) - - # Automation setup if test "$with_automation" = "yes"; then AC_DEFINE(WITH_AUTOMATION, 1, [Enable Automation support, requires any automation language.]) diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am index cab8ac6ef..1da926b6e 100644 --- a/aegisub/src/Makefile.am +++ b/aegisub/src/Makefile.am @@ -104,14 +104,6 @@ LIBS += @LUA_LDFLAGS@ aegisub_2_2_LDADD += libauto4_lua.a endif -if HAVE_AUTO4_RUBY -noinst_LIBRARIES += libauto4_ruby.a -libauto4_ruby_a_SOURCES = auto4_ruby_assfile.cpp auto4_ruby.cpp auto4_ruby_dialog.cpp -libauto4_ruby_a_CPPFLAGS = @RUBY_CFLAGS@ -aegisub_2_2_LDFLAGS += @RUBY_LDFLAGS@ -aegisub_2_2_LDADD += libauto4_ruby.a -endif - if HAVE_HUNSPELL noinst_LIBRARIES += libmisc_hunspell.a libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp @@ -156,9 +148,6 @@ EXTRA_aegisub_2_2_SOURCES = \ auto4_lua_assfile.cpp \ auto4_lua_dialog.cpp \ auto4_lua_scriptreader.cpp \ - auto4_ruby.cpp \ - auto4_ruby_assfile.cpp \ - auto4_ruby_dialog.cpp \ avisynth_wrap.cpp \ dialog_associations.cpp \ osx_bevelButton.cpp \