From 852ceef55d6afaa43f11fd9809cc2dcfef8de3cb Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Thu, 8 Jan 2009 08:46:10 +0000
Subject: [PATCH] On OS X shared librarys end with .dylib not .so, this fixes
 the (lame) workaround for auto3 linking.

Originally committed to SVN as r2676.
---
 aegisub/Makefile.am        | 8 +++++++-
 aegisub/standard_paths.cpp | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index 8c70031bd..61ed7e9b6 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -116,12 +116,18 @@ aegisub_2_1_LDFLAGS += @RUBY_LDFLAGS@
 aegisub_2_1_LDADD += libauto4_ruby.a
 endif
 
+if BUILD_DARWIN
+AUTO3_LIB = ../auto3/.libs/libaegisub-auto3-2.1.0.dylib
+else
+AUTO3_LIB = ../auto3/.libs/libaegisub-auto3-2.1.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.1
-aegisub_2_1_LDADD += ../auto3/.libs/libaegisub-auto3-2.1.so
+aegisub_2_1_LDADD += ${AUTO3_LIB}
 endif
 
 if HAVE_HUNSPELL
diff --git a/aegisub/standard_paths.cpp b/aegisub/standard_paths.cpp
index 5c50aebaa..b1dbbe621 100644
--- a/aegisub/standard_paths.cpp
+++ b/aegisub/standard_paths.cpp
@@ -66,6 +66,9 @@ StandardPaths::StandardPaths() {
 #ifdef __WINDOWS__
 	wxString dataDir = paths.GetDataDir();
 	wxString userDir = paths.GetUserDataDir();
+#elif defined(__APPLE__)
+	wxString dataDir = paths.GetDataDir();
+	wxString userDir = paths.GetUserDataDir() + _T("-") + _T(AEGISUB_VERSION_DATA);
 #else
 	wxString dataDir = paths.GetDataDir() + _T("/") + _T(AEGISUB_VERSION_DATA);
 	wxString userDir = paths.GetUserDataDir() + _T("-") + _T(AEGISUB_VERSION_DATA);