aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@vmiklos.hu>2013-03-01 11:28:44 +0100
committerMiklos Vajna <vmiklos@vmiklos.hu>2013-03-01 11:28:44 +0100
commitb2b7f5247199ad9b49e8a1f095b040fa0f4b9807 (patch)
treefd4c595bc97b3251f8ebb6439142994efc26b6c5
parent36f6ab3f1534545ceccd5363962a2967667d48fb (diff)
#978 fix Mac build of the Skype plugin
-rw-r--r--Makefile2
-rwxr-xr-xconfigure5
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6e30c473..b64337a5 100644
--- a/Makefile
+++ b/Makefile
@@ -169,7 +169,7 @@ $(OTR_PI): %.so: $(_SRCDIR_)%.c
$(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
@echo '*' Building plugin skype
- @$(CC) $(CFLAGS) -fPIC -shared $< -o $@
+ @$(CC) $(CFLAGS) $(SKYPEFLAGS) $< -o $@
$(objects): %.o: $(_SRCDIR_)%.c
@echo '*' Compiling $<
diff --git a/configure b/configure
index 8e700704..0aaebd08 100755
--- a/configure
+++ b/configure
@@ -547,6 +547,11 @@ elif [ "$otr" = "plugin" ]; then
fi
if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
+ if [ "$arch" = "Darwin" ]; then
+ echo "SKYPEFLAGS=-dynamiclib -undefined dynamic_lookup" >> Makefile.settings
+ else
+ echo "SKYPEFLAGS=-fPIC -shared" >> Makefile.settings
+ fi
echo 'SKYPE_PI=skype.so' >> Makefile.settings
protocols_mods="$protocol_mods skype(plugin)"
fi