From 3f4349584f96d0dab1bef586317ecdace4947912 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Tue, 1 Jan 2008 22:42:29 +0000
Subject: [PATCH] Removed dependency from universal charset detector (that was
 the last one)

Originally committed to SVN as r1662.
---
 aegisub/text_file_reader.cpp |  6 +++---
 aegisub/win32/config0.h      | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/aegisub/text_file_reader.cpp b/aegisub/text_file_reader.cpp
index 2bfe412ff..fa93ab886 100644
--- a/aegisub/text_file_reader.cpp
+++ b/aegisub/text_file_reader.cpp
@@ -40,10 +40,10 @@
 #include <algorithm>
 #include <string>
 #include "text_file_reader.h"
+#include "config.h"
 
 #ifdef __WINDOWS__
-#ifndef NO_AUTODETECT_CHARSET
-#define AUTODETECT_CHARSET
+#ifdef WITH_UNIVCHARDET
 #include "charset_detect.h"
 #endif
 #endif
@@ -143,7 +143,7 @@ wxString TextFileReader::GetEncoding(const wxString _filename) {
 		if (b[i] < 9 || (b[i] > 13 && b[i] < 32)) return _T("binary");
 	}
 
-	#ifdef AUTODETECT_CHARSET
+	#ifdef WITH_UNIVCHARDET
 	// Use universalchardet library to detect charset
 	CharSetDetect det;
 	return det.GetEncoding(_filename);
diff --git a/aegisub/win32/config0.h b/aegisub/win32/config0.h
index 312bd367e..78c93de23 100644
--- a/aegisub/win32/config0.h
+++ b/aegisub/win32/config0.h
@@ -38,12 +38,12 @@
 
 
 // Enable Automation
-// Requires: Lua
+// Requires: Lua (in repository)
 //#define WITH_AUTOMATION
 
 
 // Enable Automation 3
-// Requires: auto3 dll, Lua
+// Requires: auto3 dll (in repository), Lua (in repository)
 //#define WITH_AUTO3
 
 
@@ -89,4 +89,9 @@
 
 // Enable libass
 // Requires: libass
-//#define WITH_LIBASS
\ No newline at end of file
+//#define WITH_LIBASS
+
+
+// Enable universal charset detector
+// Requires: universalcharset (in repository)
+//#define WITH_UNIVCHARDET