From 50472956358ca5da52e407dd36432ba10270d826 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Tue, 4 Mar 2008 23:17:07 +0000
Subject: [PATCH] Separate general Auto4 support and Auto4 Lua support into
 different defines in source

Originally committed to SVN as r1889.
---
 aegisub/auto4_lua.cpp              | 4 ++--
 aegisub/auto4_lua_assfile.cpp      | 5 +++--
 aegisub/auto4_lua_dialog.cpp       | 4 ++--
 aegisub/auto4_lua_scriptreader.cpp | 4 ++--
 aegisub/win32/config0.h            | 7 ++++++-
 aegisub/win64/config0.h            | 7 ++++++-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/aegisub/auto4_lua.cpp b/aegisub/auto4_lua.cpp
index b70ed32ab..8a4b29e42 100644
--- a/aegisub/auto4_lua.cpp
+++ b/aegisub/auto4_lua.cpp
@@ -33,7 +33,7 @@
 // Contact: mailto:jiifurusu@gmail.com
 //
 
-#ifdef WITH_AUTOMATION
+#ifdef WITH_AUTO4_LUA
 
 #include "auto4_lua.h"
 #include "auto4_lua_scriptreader.h"
@@ -921,4 +921,4 @@ namespace Automation4 {
 
 };
 
-#endif // WITH_AUTOMATION
+#endif // WITH_AUTO4_LUA
diff --git a/aegisub/auto4_lua_assfile.cpp b/aegisub/auto4_lua_assfile.cpp
index 4b74c61ab..6702d499e 100644
--- a/aegisub/auto4_lua_assfile.cpp
+++ b/aegisub/auto4_lua_assfile.cpp
@@ -33,7 +33,7 @@
 // Contact: mailto:jiifurusu@gmail.com
 //
 
-#ifdef WITH_AUTOMATION
+#ifdef WITH_AUTO4_LUA
 
 #include "auto4_lua.h"
 #include "ass_dialogue.h"
@@ -957,4 +957,5 @@ namespace Automation4 {
 
 };
 
-#endif // WITH_AUTOMATION
+#endif // WITH_AUTO4_LUA
+
diff --git a/aegisub/auto4_lua_dialog.cpp b/aegisub/auto4_lua_dialog.cpp
index 201276b7f..2dece80dd 100644
--- a/aegisub/auto4_lua_dialog.cpp
+++ b/aegisub/auto4_lua_dialog.cpp
@@ -34,7 +34,7 @@
 //
 
 
-#ifdef WITH_AUTOMATION
+#ifdef WITH_AUTO4_LUA
 
 #include "auto4_lua.h"
 #include "../lua51/src/lualib.h"
@@ -753,4 +753,4 @@ badcontrol:
 
 };
 
-#endif // WITH_AUTOMATION
+#endif // WITH_AUTO4_LUA
diff --git a/aegisub/auto4_lua_scriptreader.cpp b/aegisub/auto4_lua_scriptreader.cpp
index 886f81ffe..d2e986edf 100644
--- a/aegisub/auto4_lua_scriptreader.cpp
+++ b/aegisub/auto4_lua_scriptreader.cpp
@@ -33,7 +33,7 @@
 // Contact: mailto:jiifurusu@gmail.com
 //
 
-#ifdef WITH_AUTOMATION
+#ifdef WITH_AUTO4_LUA
 
 #include "auto4_lua_scriptreader.h"
 
@@ -106,4 +106,4 @@ namespace Automation4 {
 
 };
 
-#endif // WITH_AUTOMATION
+#endif // WITH_AUTO4_LUA
diff --git a/aegisub/win32/config0.h b/aegisub/win32/config0.h
index 90dcbc14c..f9f774f57 100644
--- a/aegisub/win32/config0.h
+++ b/aegisub/win32/config0.h
@@ -46,10 +46,15 @@
 ////////////// HIGH PRIORITY /////////////
 
 // Enable Automation
-// Requires: Lua (in repository)
+// Requires: Nothing
 //#define WITH_AUTOMATION
 
 
+// Enable Automation 4 Lua
+// Requires: Lua 5.1 (in repository)
+//#define WITH_AUTO4_LUA
+
+
 // Enable Automation 3
 // Requires: auto3 dll (in repository), Lua (in repository)
 //#define WITH_AUTO3
diff --git a/aegisub/win64/config0.h b/aegisub/win64/config0.h
index 5638f74ce..671b1381c 100644
--- a/aegisub/win64/config0.h
+++ b/aegisub/win64/config0.h
@@ -46,10 +46,15 @@
 ////////////// HIGH PRIORITY /////////////
 
 // Enable Automation
-// Requires: Lua (in repository)
+// Requires: Nothing
 //#define WITH_AUTOMATION
 
 
+// Enable Automation 4 Lua
+// Requires: Lua 5.1 (in repository)
+//#define WITH_AUTO4_LUA
+
+
 // Enable Automation 3
 // Requires: auto3 dll (in repository), Lua (in repository)
 //#define WITH_AUTO3