From 61f2b2ddace412292de5290e8682cf30acd40576 Mon Sep 17 00:00:00 2001
From: paul <paul@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sun, 23 Nov 2008 13:14:55 +0000
Subject: [PATCH] print error msgs if shm removal fails; properly handle
 out-of-tree builds in tools subdir; bump to 0.115.2

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@3102 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 configure.ac      |  2 +-
 libjack/shm.c     |  8 ++++++--
 tools/Makefile.am | 34 +++++++++++++++++-----------------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index e8f523e..4cd92d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl                 changes are made
 dnl ---
 JACK_MAJOR_VERSION=0
 JACK_MINOR_VERSION=115
-JACK_MICRO_VERSION=1
+JACK_MICRO_VERSION=2
 
 dnl ---
 dnl HOWTO: updating the jack protocol version
diff --git a/libjack/shm.c b/libjack/shm.c
index bc0a8cd..d72f71c 100644
--- a/libjack/shm.c
+++ b/libjack/shm.c
@@ -653,7 +653,9 @@ static void
 jack_remove_shm (jack_shm_id_t *id)
 {
 	/* registry may or may not be locked */
-	shm_unlink ((char *) id);
+	if (shm_unlink ((char *) id) != 0) {
+		jack_error ("could not remove SHM ID %s", id);
+	}
 }
 
 void
@@ -844,7 +846,9 @@ static void
 jack_remove_shm (jack_shm_id_t *id)
 {
 	/* registry may or may not be locked */
-	shmctl (*id, IPC_RMID, NULL);
+	if (shmctl (*id, IPC_RMID, NULL) != 0) {
+		jack_error ("failed to remove SHM segment\n");
+	}
 }
 
 void
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1336c98..43948bb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -64,46 +64,46 @@ AM_CXXFLAGS = -I.. $(JACK_CFLAGS) $(sndfile_cflags)
 
 jack_connect_SOURCES = connect.c
 jack_connect_LDFLAGS = @OS_LDFLAGS@
-jack_connect_LDADD = ../libjack/libjack.la
+jack_connect_LDADD = $(top_builddir)/libjack/libjack.la
 
 jack_disconnect_SOURCES = connect.c
 jack_disconnect_LDFLAGS = @OS_LDFLAGS@
-jack_disconnect_LDADD = ../libjack/libjack.la
+jack_disconnect_LDADD = $(top_builddir)/libjack/libjack.la
 
 jack_monitor_client_SOURCES = monitor_client.c
 jack_monitor_client_LDFLAGS = @OS_LDFLAGS@
-jack_monitor_client_LDADD = ../libjack/libjack.la
+jack_monitor_client_LDADD = $(top_builddir)/libjack/libjack.la
 
 jack_thread_wait_SOURCES = tw.c
 jack_thread_wait_LDFLAGS = @OS_LDFLAGS@
-jack_thread_wait_LDADD = ../libjack/libjack.la
+jack_thread_wait_LDADD = $(top_builddir)/libjack/libjack.la
 
 jack_evmon_SOURCES = evmon.c
 jack_evmon_LDFLAGS = @OS_LDFLAGS@
-jack_evmon_LDADD = ../libjack/libjack.la
+jack_evmon_LDADD = $(top_builddir)/libjack/libjack.la
 
 jack_alias_SOURCES = alias.c
 jack_alias_LDFLAGS = @OS_LDFLAGS@
-jack_alias_LDADD = ../libjack/libjack.la
+jack_alias_LDADD = $(top_builddir)/libjack/libjack.la
 
 jack_lsp_SOURCES = lsp.c
 jack_lsp_LDFLAGS = @OS_LDFLAGS@
-jack_lsp_LDADD = ../libjack/libjack.la
+jack_lsp_LDADD = $(top_builddir)/libjack/libjack.la
 
 jack_freewheel_SOURCES = freewheel.c
 jack_freewheel_LDFLAGS = @OS_LDFLAGS@
-jack_freewheel_LDADD = ../libjack/libjack.la
+jack_freewheel_LDADD = $(top_builddir)/libjack/libjack.la
 
 if HAVE_SNDFILE
 jackrec_SOURCES = capture_client.c
 jackrec_LDFLAGS = @SNDFILE_LIBS@ @OS_LDFLAGS@
-jackrec_LDADD = ../libjack/libjack.la
+jackrec_LDADD = $(top_builddir)/libjack/libjack.la
 endif
 
 if HAVE_READLINE
 jack_transport_SOURCES = transport.c
 jack_transport_LDFLAGS = -lreadline @READLINE_DEPS@ @OS_LDFLAGS@
-jack_transport_LDADD = ../libjack/libjack.la
+jack_transport_LDADD = $(top_builddir)/libjack/libjack.la
 endif
 
 #
@@ -112,29 +112,29 @@ endif
 
 jack_load_SOURCES = ipload.c
 jack_load_LDFLAGS = @OS_LDFLAGS@
-jack_load_LDADD = ../libjack/libjack.la
+jack_load_LDADD = $(top_builddir)/libjack/libjack.la
 
 jack_unload_SOURCES = ipunload.c
 jack_unload_LDFLAGS = @OS_LDFLAGS@
-jack_unload_LDADD = ../libjack/libjack.la
+jack_unload_LDADD = $(top_builddir)/libjack/libjack.la
 
 #
 # Netjack slave tools
 #
 if HAVE_SAMPLERATE
-jack_netsource_SOURCES = netsource.c ../drivers/netjack/netjack_packet.c
-jack_netsource_CFLAGS = -I../drivers/netjack
+jack_netsource_SOURCES = netsource.c $(top_builddir)/drivers/netjack/netjack_packet.c
+jack_netsource_CFLAGS = -I$(top_srcdir)/drivers/netjack
 jack_netsource_LDFLAGS = -lsamplerate @OS_LDFLAGS@
-jack_netsource_LDADD = ../libjack/libjack.la
+jack_netsource_LDADD = $(top_builddir)/libjack/libjack.la
 
 if HAVE_ALSA
 alsa_in_SOURCES = alsa_in.c
 alsa_in_LDFLAGS = -lasound -lsamplerate @OS_LDFLAGS@
-alsa_in_LDADD = ../libjack/libjack.la
+alsa_in_LDADD = $(top_builddir)/libjack/libjack.la
 
 alsa_out_SOURCES = alsa_out.c
 alsa_out_LDFLAGS = -lasound -lsamplerate @OS_LDFLAGS@
-alsa_out_LDADD = ../libjack/libjack.la
+alsa_out_LDADD = $(top_builddir)/libjack/libjack.la
 endif #HAVE_ALSA
 endif #HAVE_SAMPLERATE