From b29f65fa0cc8213a08be2cccb5b1ad0886d4bb21 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Tue, 1 May 2012 01:40:29 +0000
Subject: [PATCH] Incorporate OS X fixes by 'GRMrGecko'.

---
 configure              | 8 ++++----
 libathemecore/linker.c | 2 --
 m4/buildsys.m4         | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 94179b764c..26d89be379 100755
--- a/configure
+++ b/configure
@@ -7482,13 +7482,13 @@ $as_echo_n "checking for shared library system... " >&6; }
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
 $as_echo "Darwin" >&6; }
 			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -install_name @rpath/${SHARED_LIB}'
 			LIB_PREFIX='lib'
 			LIB_SUFFIX='.dylib'
-			LDFLAGS_RPATH='-Wl,-macosx_version_min,10.5 -Wl,-rpath,${libdir}'
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
 			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
-			PLUGIN_SUFFIX='.impl'
+			PLUGIN_LDFLAGS='-shared -undefined dynamic_lookup'
+			PLUGIN_SUFFIX='.so'
 			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
 			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
 			CLEAN_LIB=''
diff --git a/libathemecore/linker.c b/libathemecore/linker.c
index 8fe7e8a609..c20cc178d1 100644
--- a/libathemecore/linker.c
+++ b/libathemecore/linker.c
@@ -28,8 +28,6 @@
 # define PLATFORM_SUFFIX ".sl"
 #elif defined(_WIN32)
 # define PLATFORM_SUFFIX ".dll"
-#elif defined(__APPLE_)
-# define PLATFORM_SUFFIX ".impl"
 #else
 # define PLATFORM_SUFFIX ".so"
 #endif
diff --git a/m4/buildsys.m4 b/m4/buildsys.m4
index 9ad0aa9277..34ca23200d 100644
--- a/m4/buildsys.m4
+++ b/m4/buildsys.m4
@@ -94,13 +94,13 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 		darwin*)
 			AC_MSG_RESULT(Darwin)
 			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -install_name @rpath/${SHARED_LIB}'
 			LIB_PREFIX='lib'
 			LIB_SUFFIX='.dylib'
-			LDFLAGS_RPATH='-Wl,-macosx_version_min,10.5 -Wl,-rpath,${libdir}'
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
 			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
-			PLUGIN_SUFFIX='.impl'
+			PLUGIN_LDFLAGS='-shared -undefined dynamic_lookup'
+			PLUGIN_SUFFIX='.so'
 			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
 			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
 			CLEAN_LIB=''