Browse Source

[0.99.28] purge shm registry on make install

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@833 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
joq 21 years ago
parent
commit
db850b5448
4 changed files with 19 additions and 3 deletions
  1. +6
    -1
      configure.ac
  2. +4
    -0
      jack/version.h.in
  3. +9
    -0
      libjack/Makefile.am
  4. +0
    -2
      libjack/shm.c

+ 6
- 1
configure.ac View File

@@ -15,7 +15,7 @@ dnl changes are made
dnl ---
JACK_MAJOR_VERSION=0
JACK_MINOR_VERSION=99
JACK_MICRO_VERSION=27
JACK_MICRO_VERSION=28

dnl ---
dnl HOWTO: updating the jack protocol version
@@ -148,9 +148,14 @@ if test "x$TRY_POSIX_SHM" = "xyes"
then
AC_MSG_RESULT([POSIX shm_open().])
AC_DEFINE(USE_POSIX_SHM,1,[Use POSIX shared memory interface])
USE_POSIX_SHM="true"
else
AC_MSG_RESULT([System V shmget().])
JACK_SHM_REGISTRY_KEY=0x00282929
AC_SUBST(JACK_SHM_REGISTRY_KEY)
USE_POSIX_SHM="false"
fi
AM_CONDITIONAL(USE_POSIX_SHM, $USE_POSIX_SHM)

JACK_CORE_CFLAGS="-I\$(top_builddir)/config -I\$(top_srcdir) \
-I\$(top_builddir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall"


+ 4
- 0
jack/version.h.in View File

@@ -18,3 +18,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#define jack_protocol_version @JACK_PROTOCOL_VERSION@

#ifndef USE_POSIX_SHM
#define JACK_SHM_REGISTRY_KEY @JACK_SHM_REGISTRY_KEY@
#endif

+ 9
- 0
libjack/Makefile.am View File

@@ -1,5 +1,14 @@
MAINTAINERCLEANFILES = Makefile.in

if USE_POSIX_SHM
install-exec-hook:
@echo "Nothing to make for $@."
else
install-exec-hook:
@echo "Removing JACK shared memory registry."
ipcrm -M @JACK_SHM_REGISTRY_KEY@
endif

SOURCE_FILES = \
client.c \
driver.c \


+ 0
- 2
libjack/shm.c View File

@@ -451,8 +451,6 @@ jack_resize_shm (jack_shm_info_t* si, jack_shmsize_t size)

#else /* USE_POSIX_SHM */

#define JACK_SHM_REGISTRY_KEY 0x282929

/* gain addressibility to shared memory registration segment */
int
jack_initialize_shm (void)


Loading…
Cancel
Save