From e213936e03bc6a2e896afd79ab812820a0e66211 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <rco@iptel.org>
Date: Thu, 10 Apr 2008 14:15:57 +0000
Subject: [PATCH] - fixed some other stuff for Darwin.

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@879 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 Makefile.defs                                |  3 +--
 apps/examples/tutorial/ivr_announce/Makefile |  2 --
 apps/ivr/Makefile                            | 14 ++++++++++++--
 apps/ivr/Makefile.defs                       |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index 81540ad2..c389b51c 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -115,8 +115,7 @@ ifeq ($(OS), darwin)
 	CPPFLAGS += -I /opt/local/include
 	LDFLAGS += -L/opt/local/lib
 
-	# those modules do not compile by now
-	exclude_modules += binrpcctrl
+	override exclude_modules += binrpcctrl mp3 examples py_sems
 else
 	LDFLAGS+= -fPIC -ldl -lsocket -lnsl -lpthread
 	TARGET=solaris
diff --git a/apps/examples/tutorial/ivr_announce/Makefile b/apps/examples/tutorial/ivr_announce/Makefile
index ee148cbc..a36e7d92 100644
--- a/apps/examples/tutorial/ivr_announce/Makefile
+++ b/apps/examples/tutorial/ivr_announce/Makefile
@@ -2,8 +2,6 @@
 NAME=ivr_announce
 VERSION=0.0.1
 
-PYTHON_VERSION=2.4
-
 LIBDIR=
 
 COREPATH=../../../../core
diff --git a/apps/ivr/Makefile b/apps/ivr/Makefile
index 467cfb23..01d7e828 100644
--- a/apps/ivr/Makefile
+++ b/apps/ivr/Makefile
@@ -11,10 +11,16 @@ PYTHON_LIBDIR = $(shell $(PY_EXE) ./python_lib.py)
 
 # put used Python modules from lib-dynload here, e.g. time, mysql, _cvs.so etc.
 PYTHON_module_cflags = -I$(PYTHON_DIR) -fno-strict-aliasing
-PYTHON_module_ldflags = -Xlinker --export-dynamic \
-			-L$(PYTHON_LIBDIR)/config \
+
+PYTHON_module_ldflags = -L$(PYTHON_LIBDIR)/config \
 			-lpython$(PY_VER)
 
+#PYTHON_module_ldflags = -Xlinker --export-dynamic \
+#			-L$(PYTHON_LIBDIR)/config \
+#			-lpython$(PY_VER)
+
+
+
 ifeq ($(TTS), y)
 #
 #   flite text to speech
@@ -81,6 +87,10 @@ endif
 
 include $(COREPATH)/plug-in/Makefile.app_module
 
+ifneq ($(OS),darwin)
+PYTHON_module_ldflags += -Xlinker --export-dynamic
+endif
+
 .PHONY: install_python_files
 install_python_files: $(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
diff --git a/apps/ivr/Makefile.defs b/apps/ivr/Makefile.defs
index a2bcf534..5182eea5 100644
--- a/apps/ivr/Makefile.defs
+++ b/apps/ivr/Makefile.defs
@@ -1,6 +1,6 @@
 # Python version: 2.5, 2.4 or 2.3
 #
-PYTHON_VERSION ?= `python -c 'import sys;print sys.version[0:3]';`
+PYTHON_VERSION ?= $(shell python -c 'import sys;print sys.version[0:3]')
 
 # For flite text-to-speech set TTS = y
 #