Nuke auto3 from the Unix/OSX build system.

Originally committed to SVN as r3199.

aegisub/automation/Makefile.am

@@ -23,15 +23,6 @@ data_auto4_lua = \
 	include/utils-auto4.lua \
 	include/utils.lua
 
-data_auto3_lua = \
-	auto3/line-per-syllable.auto3 \
-	auto3/multi-template.auto3 \
-	auto3/simple-k-replacer.auto3 \
-	include/karaskel-adv.auto3 \
-	include/karaskel-base.auto3 \
-	include/karaskel.auto3 \
-	include/utils.auto3
-
 data_auto4_perl = \
 	autoload/macro-1p-edgeblur.pl \
 	include/Aegisub/PerlConsole.pm
@@ -59,20 +50,6 @@ data_auto4_lua_doc = \
 	demos/future-windy-blur.lua \
 	demos/raytracer.lua
 
-data_auto3_lua_doc = \
-	demos/auto3/readme.txt \
-	demos/auto3/1-minimal.lua \
-	demos/auto3/10-furigana.ass \
-	demos/auto3/10-furigana.lua \
-	demos/auto3/2-dump.lua \
-	demos/auto3/3-include.lua \
-	demos/auto3/4-text_extents.lua \
-	demos/auto3/5-configuration.lua \
-	demos/auto3/6-simple-effect.lua \
-	demos/auto3/7-advanced-effect.lua \
-	demos/auto3/8-skeleton.lua \
-	demos/auto3/9-advanced-skeleton.lua
-
 data_auto4_perl_doc = \
 	demos/perl-console.pl \
 	v4-docs/perl-api.txt
@@ -94,11 +71,6 @@ nobase_automation_DATA += $(data_auto4_lua)
 nobase_share_doc_DATA += $(data_auto4_lua_doc)
 endif
 
-if HAVE_AUTO3_LUA
-nobase_automation_DATA += $(data_auto3_lua)
-nobase_share_doc_DATA += $(data_auto3_lua_doc)
-endif
-
 if HAVE_AUTO4_PERL
 nobase_automation_DATA += $(data_auto4_perl)
 nobase_share_doc_DATA += $(data_auto4_perl_doc)
@@ -113,11 +85,9 @@ endif
 EXTRA_DIST = \
 	$(data_general) \
 	$(data_auto4_lua) \
-	$(data_auto3_lua) \
 	$(data_auto4_perl) \
 	$(data_auto4_ruby) \
 	$(data_general_doc) \
 	$(data_auto4_lua_doc) \
-	$(data_auto3_lua_doc) \
 	$(data_auto4_perl_doc) \
 	$(data_auto4_ruby_doc)

aegisub/configure.in

@@ -19,7 +19,6 @@ m4_define([libavutil_required_version], [50.3.0])    # (r18642)
 m4_define([libpostproc_required_version], [51.2.0])  # (r18642)
 m4_define([libswscale_required_version], [0.7.1])    # (r18642)
 
-m4_define([lua_auto3_required_version], [5.0])
 m4_define([lua_auto4_required_version], [5.1])
 m4_define([portaudio_required_version], [19])
 m4_define([pulseaudio_required_version], [0.5])
@@ -810,50 +809,6 @@ AC_SUBST(LUA_CFLAGS)
 AC_SUBST(LUA_LDFLAGS)
 
 
-##################
-## Auto3 (LUA 5.0)
-##################
-
-AC_ARG_VAR([LUA50_CFLAGS], [CFLAGS to use for LUA 5.0 (default: CPPFLAGS)])
-AC_ARG_VAR([LUA50_LDFLAGS], [LDFLAGS to use for LUA 5.1 (default: -llua -llualib)])
-if test -z "$LUA50_LDFLAGS"; then
-  LUA50_LDFLAGS="-llua -llualib";
-fi
-
-AC_ARG_WITH(lua50,
-[  --without-lua50         build without lua 5.0 (auto3)], [lua50_disabled="(disabled)"])
-
-if test "$with_lua50" != no; then
-  AC_AGI_COMPILE([Lua 5.0 (auto3)], [lua50], [$LUA50_CFLAGS], [$LUA50_LDFLAGS],[
-extern "C" {
-#include "lua.h"
-#include "lauxlib.h"
-}
-#ifdef lua_open
-#error This is not Lua 5.0
-#endif
-int main() {
-  lua_State *L = lua_open();
-  if (!L) return 1;
-  luaL_newmetatable(L, "test");
-  lua_close(L);
-}])
-fi
-
-if test "$agi_cv_with_lua50" = "yes"; then
-  with_auto3="yes"
-  with_automation="yes"
-  AC_DEFINE(WITH_AUTO3, 1, [Enable Automation (auto3, DEPRECIATED!), requires lua 5.0])
-else
-  with_auto3="no"
-fi
-
-AM_CONDITIONAL([HAVE_AUTO3_LUA], [test "$with_auto3" != "no"])
-AC_SUBST(LUA50_CFLAGS)
-AC_SUBST(LUA50_LDFLAGS)
-
-
-
 #############
 ## Auto4 PERL
 #############
@@ -1272,7 +1227,6 @@ Makefile
 src/Makefile
 src/bitmaps/Makefile
 src/libresrc/Makefile
-src/libauto3/Makefile
 src/libosxutil/Makefile
 universalchardet/Makefile
 libffms/Makefile
@@ -1340,7 +1294,6 @@ Default Settings
   Audio Player:          $default_player_audio
 
 Scripting Engines
-  auto3 Lua:             $with_auto3 $lua50_disabled
   auto4 Lua:             $with_auto4 $lua51_disabled
   auto4 Perl:            $with_cv_perl $perl_disabled
   auto4 Ruby:            $with_cv_ruby $ruby_disabled

aegisub/src/Makefile.am

@@ -8,14 +8,9 @@ libosxutil_lib = libosxutil/libosxutil.a
 libosxutil_ldflags = -framework CoreFoundation
 endif
 
-if HAVE_AUTO3_LUA
-libauto3 = libauto3
-endif
-
 SUBDIRS = \
 	bitmaps \
 	libresrc \
-	$(libauto3) \
 	$(libosxutil_subdir)
 
 AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I../libffms/include
@@ -125,20 +120,6 @@ aegisub_2_2_LDFLAGS += @RUBY_LDFLAGS@
 aegisub_2_2_LDADD += libauto4_ruby.a
 endif
 
-if BUILD_DARWIN
-AUTO3_LIB = $(srcdir)/libauto3/.libs/libaegisub-auto3-2.2.0.dylib
-else
-AUTO3_LIB = $(srcdir)/libauto3/.libs/libaegisub-auto3-2.2.so
-endif
-
-if HAVE_AUTO3_LUA
-AUTO3_LUA = auto4_auto3.cpp
-# This is a workaround top stop libtool from binging in dependency_libs which
-# causes many link errors due to auto4 (lua 5.1) support.
-#aegisub_2_1_LDADD += -L$(srcdir)/../auto3 -laegisub-auto3-2.2
-aegisub_2_2_LDADD += ${AUTO3_LIB}
-endif
-
 if HAVE_HUNSPELL
 noinst_LIBRARIES += libmisc_hunspell.a
 libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp