From b2a5fe406cef98471a565a5c18596af51dec84f8 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 1 Nov 2012 08:20:11 -0700
Subject: [PATCH] Unconditionally enable Lua and Hunspell

---
 .../Aegisub/Aegisub.DefaultConfiguration.props     |  4 +---
 aegisub/build/Aegisub/Aegisub.targets              |  4 ++--
 aegisub/build/Aegisub/Aegisub.xml                  | 14 --------------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props b/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
index 4d31ec2a6..a3695537b 100644
--- a/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
+++ b/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
@@ -37,7 +37,6 @@
 
   <PropertyGroup>
     <AegisubUseConfigWindowsH Condition="'$(AegisubUseConfigWindowsH)'==''">true</AegisubUseConfigWindowsH>
-    <AegisubUseAutomationLua Condition="'$(AegisubUseAutomationLua)'==''">true</AegisubUseAutomationLua>
     <AegisubUseDSound Condition="'$(AegisubUseDSound)'==''">true</AegisubUseDSound>
     <DirectXSDKPath Condition="'$(DirectXSDKPath)'==''">$(DXSDK_DIR)</DirectXSDKPath>
     <AegisubUseAvisynth Condition="'$(AegisubUseAvisynth)|$(Platform)'=='|Win32'">true</AegisubUseAvisynth>
@@ -47,7 +46,6 @@
     <FFmpegSourceLibraryPath Condition="'$(FFmpegSourceLibraryPath)'==''">$(AegisubSourceBase)libffms\lib\</FFmpegSourceLibraryPath>
     <FFmpegSourceLibraryName Condition="'$(FFmpegSourceLibraryName)'==''">ffms2.lib</FFmpegSourceLibraryName>
     <AegisubUseFt2 Condition="'$(AegisubUseFt2)'==''">true</AegisubUseFt2>
-    <AegisubUseHunspell Condition="'$(AegisubUseHunspell)'==''">true</AegisubUseHunspell>
     <AegisubUseFftw Condition="'$(AegisubUseFftw)'==''">false</AegisubUseFftw>
     <AegisubUseLibass Condition="'$(AegisubUseLibass)'==''">false</AegisubUseLibass>
     <AegisubUseCsri Condition="'$(AegisubUseCsri)'==''">HelperLibrary</AegisubUseCsri>
@@ -55,4 +53,4 @@
     <AegisubSpecialBuild Condition="'$(AegisubSpecialBuild)'==''">false</AegisubSpecialBuild>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index a299342ad..fe1e6c770 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -132,7 +132,7 @@
   </ItemGroup>
 
   <!-- Automation Lua support -->
-  <ItemDefinitionGroup Condition="'$(AegisubUseAutomationLua)'=='true'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AUTO4_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(AegisubContribBase)lua51\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -140,7 +140,7 @@
   </ItemDefinitionGroup>
 
   <!-- Hunspell support -->
-  <ItemDefinitionGroup Condition="'$(AegisubUseHunspell)'=='true'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_HUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(AegisubContribBase)hunspell\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/aegisub/build/Aegisub/Aegisub.xml b/aegisub/build/Aegisub/Aegisub.xml
index ef6f46f13..bbe8025e3 100644
--- a/aegisub/build/Aegisub/Aegisub.xml
+++ b/aegisub/build/Aegisub/Aegisub.xml
@@ -54,13 +54,6 @@
     Description="Specify whether to use config_windows.h or the configuration on this page to control features. The settings on this page still control automatic compiler and link settings for the features."
     />
 
-  <BoolProperty
-    Name="AegisubUseAutomationLua"
-    Category="Features"
-    DisplayName="Use Automation 4 Lua"
-    Description="Specify whether to include Automation 4 support and the Lua engine. This is included and requires no configuration."
-    />
-
   <BoolProperty
     Name="AegisubUseDSound"
     Category="Features"
@@ -154,13 +147,6 @@
     </StringProperty.DataSource>
   </StringProperty>
 
-  <BoolProperty
-    Name="AegisubUseHunspell"
-    Category="Features"
-    DisplayName="Use Hunspell"
-    Description="Specify whether to use the Hunspell spell checker library. This is included and requires no configuration."
-    />
-
   <BoolProperty
     Name="AegisubUseFftw"
     Category="Features"