From bad3af93817e3f922c832f9ff1e2cecf4e8aa9d4 Mon Sep 17 00:00:00 2001
From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 5 Dec 2005 20:11:21 +0000
Subject: [PATCH] + Fix for Darwin and soname logic

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@878 d19143bc-622f-0410-bfdd-b5b2a6649095
---
 mlt++/configure    |    5 +++--
 mlt++/src/Makefile |    8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mlt++/configure b/mlt++/configure
index 030e4ae..f93620c 100755
--- a/mlt++/configure
+++ b/mlt++/configure
@@ -30,13 +30,14 @@ echo "prefix=$prefix" >> config.mak
 echo "libdir=$libdir" >> config.mak
 
 targetos=$(uname -s)
+echo "targetos=$targetos" >> config.mak
 
 case $targetos in 
 	Darwin)
 		echo LIBSUF=.dylib
         echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `mlt-config --cflags`"
-		echo "LIBFLAGS=-dynamiclib"
-        echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs` -single_module"
+		echo "LIBFLAGS=-dynamiclib -single_module"
+        echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs`"
 		;;
 	Linux)
 		echo LIBSUF=.so
diff --git a/mlt++/src/Makefile b/mlt++/src/Makefile
index 72b900f..eb7e69e 100644
--- a/mlt++/src/Makefile
+++ b/mlt++/src/Makefile
@@ -1,8 +1,15 @@
 include ../config.mak
 INSTALL = install
 
+ifneq ($(targetos), Darwin)
 NAME = libmlt++$(LIBSUF)
 TARGET = $(NAME).$(version)
+LIBFLAGS += -Wl,-soname,$(TARGET)
+else
+NAME = libmlt++$(LIBSUF)
+TARGET = libmlt++.$(version)$(LIBSUF)
+LIBFLAGS += -install_name $(libdir)/$(TARGET)
+endif
 
 OBJS = MltConsumer.o \
 	   MltDeque.o \
@@ -28,7 +35,6 @@ OBJS = MltConsumer.o \
 
 SRCS = $(OBJS:.o=.cpp)
 HEADERS = Mlt.h $(OBJS:.o=.h)
-LDFLAGS += -Wl,-soname,$(TARGET)
 
 all:		$(TARGET)
 
-- 
1.7.4.4