6 files changed, 12 insertions, 12 deletions
diff --git a/sca-cpp/trunk/components/chat/Makefile.am b/sca-cpp/trunk/components/chat/Makefile.am
index 8856e536fd..5c995ad452 100644
--- a/sca-cpp/trunk/components/chat/Makefile.am
+++ b/sca-cpp/trunk/components/chat/Makefile.am
@@ -34,22 +34,22 @@ vysper.prefix: $(top_builddir)/config.status
 EXTRA_DIST = chat.composite chat-sendreceiver.componentType chat-sender.componentType chat-sender2.componentType *.scm
 
 comp_LTLIBRARIES = libchat-sendreceiver.la libchat-sender.la libchat-sender2.la
-noinst_DATA = libchat-sendreceiver.so libchat-sender.so libchat-sender2.so
+noinst_DATA = libchat-sendreceiver${libsuffix} libchat-sender${libsuffix} libchat-sender2${libsuffix}
 
 libchat_sendreceiver_la_SOURCES = chat-sendreceiver.cpp
 libchat_sendreceiver_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
-libchat-sendreceiver.so:
-	ln -s .libs/libchat-sendreceiver.so
+libchat-sendreceiver${libsuffix}:
+	ln -s .libs/libchat-sendreceiver${libsuffix}
 
 libchat_sender_la_SOURCES = chat-sender.cpp
 libchat_sender_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
-libchat-sender.so:
-	ln -s .libs/libchat-sender.so
+libchat-sender${libsuffix}:
+	ln -s .libs/libchat-sender${libsuffix}
 
 libchat_sender2_la_SOURCES = chat-sender2.cpp
 libchat_sender2_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
-libchat-sender2.so:
-	ln -s .libs/libchat-sender2.so
+libchat-sender2${libsuffix}:
+	ln -s .libs/libchat-sender2${libsuffix}
 
 chat_send_SOURCES = chat-send.cpp
 chat_send_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
diff --git a/sca-cpp/trunk/components/chat/echo-test b/sca-cpp/trunk/components/chat/echo-test
index 271d40d122..c155d4a9a8 100755
--- a/sca-cpp/trunk/components/chat/echo-test
+++ b/sca-cpp/trunk/components/chat/echo-test
@@ -28,4 +28,4 @@ rc=$?
 # Cleanup
 ./vysper-stop
 sleep 1
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/components/chat/server-test b/sca-cpp/trunk/components/chat/server-test
index fcac90741c..cbece709f5 100755
--- a/sca-cpp/trunk/components/chat/server-test
+++ b/sca-cpp/trunk/components/chat/server-test
@@ -40,4 +40,4 @@ rc=$?
 sleep 1
 ./vysper-stop
 sleep 1
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/components/chat/vysper-classpath b/sca-cpp/trunk/components/chat/vysper-classpath
index 7cf16a5ae8..e164200ed2 100755
--- a/sca-cpp/trunk/components/chat/vysper-classpath
+++ b/sca-cpp/trunk/components/chat/vysper-classpath
@@ -18,7 +18,7 @@
 #  under the License.
 
 # Compute a classpath for running a Vysper server
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 
 if [ "$1" = "" ]; then
   vysper_prefix=`cat $here/vysper.prefix`
diff --git a/sca-cpp/trunk/components/chat/vysper-start b/sca-cpp/trunk/components/chat/vysper-start
index af95ecadf4..b7fcad5217 100755
--- a/sca-cpp/trunk/components/chat/vysper-start
+++ b/sca-cpp/trunk/components/chat/vysper-start
@@ -18,7 +18,7 @@
 #  under the License.
 
 # Start Vysper test XMPP server
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 
 java_prefix=`cat $here/../../modules/java/java.prefix`
 mkdir -p $here/tmp/logs
diff --git a/sca-cpp/trunk/components/chat/vysper-stop b/sca-cpp/trunk/components/chat/vysper-stop
index 3c4be4efa9..6ae9246134 100755
--- a/sca-cpp/trunk/components/chat/vysper-stop
+++ b/sca-cpp/trunk/components/chat/vysper-stop
@@ -18,7 +18,7 @@
 #  under the License.
 
 # Stop Vysper test XMPP server
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 
 java_prefix=`cat $here/../../modules/java/java.prefix`
 kill `ps -ef | grep -v grep | grep "${java_prefix}/jre/bin/java" | grep "vysper" | awk '{ print $2 }'`