[0.96.0] merge MacOSX EXP tree into HEAD

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@673 0c269be4-1314-0410-8aa9-9f06e86f4224

.cvsignore

@@ -1,25 +1,19 @@
+*.desc
+*.pc
+*.tar.gz
+*diff
+*diffs
+.deps
+Makefile
+Makefile.in
+aclocal.m4
 autom4te.cache
+config.cache
 config.h
 config.h.in
-stamp-h1
 config.log
-aclocal.m4
 config.status
-config.cache
-libtool
-*.pc
-.deps
-Makefile
-Makefile.in
-jack.spec
 configure
-*.tar.gz
-*.desc
-*diff
-*diffs
-compile
-depcomp
-install-sh
-missing
-mkinstalldirs
-doxygen-build.stamp
+jack.spec
+libtool
+stamp-h1

Makefile.am

@@ -1,8 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
+MAINTAINERCLEANFILES = Makefile.in configure config.h.in \
                        stamp-h.in config.log config.cache \
-                       config.guess mkinstalldirs config.status \
-                       missing install-sh config.sub ltconfig \
-                       ltmain.sh
+                       config.status
 
 if HAVE_DOXYGEN
 DOC_DIR = doc
@@ -16,14 +14,13 @@ dist-check-doxygen:
 	@false
 endif
 
-SUBDIRS = jack libjack jackd drivers example-clients $(DOC_DIR)
-
-DIST_SUBDIRS = jack libjack jackd drivers example-clients doc
+SUBDIRS =      config jack libjack jackd drivers example-clients $(DOC_DIR)
+DIST_SUBDIRS = config jack libjack jackd drivers example-clients doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = jack.pc
 
-EXTRA_DIST = depcomp COPYING COPYING.GPL COPYING.LGPL
+EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL
 
 AUTOMAKE_OPTIONS = foreign
 

TODO

@@ -20,6 +20,15 @@ send a change request to Kai Vehmanen (mailto:k_at_eca.cx).
 
 -----------------------------------------------------------------------
 
+TODO for merging Mac OS X support
+
+- <sysdeps/atomicity.h>
+  -- fix cpu/generic/atomicity.h:36:#include <bits/gthr.h>
+- clean up other header files
+  -- <sysdeps/poll.h>, fakepoll.h, etc.
+  -- <sysdeps/ipc.h>, <sys/ipc.h> in shm.c
+  -- need config/os/generic/time.h implementation
+
 TODO before-1.0
 
 - add explanation of protocol versioning to README.developers (kaiv)

autogen.sh

@@ -1,11 +1,25 @@
 #!/bin/sh
 
-libtoolize --force 2>&1 | sed '/^You should/d' || {
+if which libtoolize >/dev/null
+then
+    LIBTOOLIZE=libtoolize
+else
+    if which glibtoolize >/dev/null
+    then
+	# on the Mac it's called glibtoolize for some reason
+	LIBTOOLIZE=glibtoolize
+    else
+	echo "libtoolize not found"
+	exit 1
+    fi
+fi
+
+$LIBTOOLIZE --force 2>&1 | sed '/^You should/d' || {
     echo "libtool failed, exiting..."
     exit 1
 }
 
-aclocal $ACLOCAL_FLAGS || {
+aclocal $ACLOCAL_FLAGS -I config || {
     echo "aclocal \$ACLOCAL_FLAGS where \$ACLOCAL_FLAGS= failed, exiting..."
     exit 1
 }

config/.cvsignore

@@ -0,0 +1,10 @@
+Makefile
+Makefile.in
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+mkinstalldirs

config/Makefile.am

@@ -0,0 +1,14 @@
+# Currently, we don't actually build anything in the `cpu' and `os'
+# subdirectories.  If we ever do, they will need Makefiles.  For now,
+# this is sufficient.  Unfortunately, their CVS subdirectories also
+# get distributed as a side-effect.
+
+EXTRA_DIST = configure.host depcomp cpu os
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.sub \
+                       install-sh ltmain.sh missing mkinstalldirs 
+
+# Link all relevant headers into the `sysdeps' directory.  The order
+# of these loops determines header file precedence.
+
+SUBDIRS =	sysdeps
+DIST_SUBDIRS =	sysdeps

config/acinclude.m4

@@ -0,0 +1,41 @@
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc
+
+dnl written by thomas vander stichele
+
+AC_DEFUN(AS_AC_EXPAND,
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix=/usr/local
+  fi
+  exec_prefix_save=$exec_prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    if test "x$prefix_save" = "xNONE"; then
+      exec_prefix=/usr/local
+    else
+      exec_prefix=$prefix
+    fi
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  [$1]=$full_var
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
+

config/configure.host

@@ -0,0 +1,159 @@
+########################################################################
+#
+# configure.host -- JACK Audio Connection Kit version.
+#
+# This script and the system-dependent header directories it uses were
+# adapted for JACK from gcc/libstdc++-v3/configure.host.
+#
+# We've tried to keep it as close to the original as possible, while
+# removing a bunch of os-specific files that didn't seem relevant.
+# The primary goal has been to avoid changing the cpu-dependent
+# atomicity.h headers.
+#
+# If you need to make changes, the relevant GCC documentation may
+# prove helpful, <http://gcc.gnu.org/onlinedocs/porting>, especially
+# the <http://gcc.gnu.org/onlinedocs/porting/Thread-safety.html>
+# discussion of <atomicity.h>.
+#
+########################################################################
+
+# This shell script handles all host based configuration for libstdc++.
+# It sets various shell variables based on the the host and the
+# configuration options.  You can modify this shell script without needing
+# to rerun autoconf/aclocal/etc.  This file is "sourced" not executed.
+#
+# You should read docs/html/17_intro/porting.* to make sense of this file.
+#
+#
+# It uses the following shell variables as set by config.guess:
+#   host                The configuration host (full CPU-vendor-OS triplet)
+#   host_cpu            The configuration host CPU
+#   host_os             The configuration host OS
+#
+#
+# It sets the following shell variables:
+#
+#   cpu_include_dir        CPU-specific directory, defaults to cpu/generic
+#                          if cpu/host_cpu doesn't exist.  This is
+#                          used to set atomicity_include_dir.
+#
+#   os_include_dir         OS-specific directory, defaults to os/generic.
+#
+#   atomicity_include_dir  location of atomicity.h,
+#                          defaults to cpu_include_dir
+#
+# It possibly modifies the following variables:
+#
+#   OS_LDFLAGS             extra flags to pass when linking the library, of
+#                          the form '-Wl,blah'
+#                          (defaults to empty in acinclude.m4)
+#
+# If the defaults will not work for your platform, you need only change the
+# variables that won't work, i.e., you do not need to explicitly set a
+# working variable to its default.  Most hosts only need to change the two
+# *_include_dir variables.
+
+
+# DEFAULTS
+# Try to guess a default cpu_include_dir based on the name of the CPU.  We
+# cannot do this for os_include_dir; there are too many portable operating
+# systems out there.  :-)
+
+# HOST-SPECIFIC OVERRIDES
+# Set any CPU-dependent bits.
+# Here we override defaults and catch more general cases due to naming
+# conventions (e.g., chip_name* to catch all variants).
+
+# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
+case "${host_cpu}" in
+  alpha*)
+    try_cpu=alpha
+    ;;
+  i[3567]86 | x86_64)
+    try_cpu=i486
+    ;;
+  hppa*)
+    try_cpu=hppa
+    ;;
+  mips*)
+    # NB: cpu/mips/atomicity.h needs MIPS II or above.  
+    # Of course, there is no sane way to test for this, no ABI macro,
+    # and no consistent host_cpu name differentiation. Therefore, only
+    # use it where it is known to be safe, ie it runs linux (see below).
+    try_cpu=generic
+    ;;
+  m680[246]0)
+    try_cpu=m68k
+    ;;
+  powerpc* | rs6000)
+    try_cpu=powerpc
+    ;;
+  s390x)
+    try_cpu=s390
+    ;;
+  sparc* | ultrasparc)
+    try_cpu=sparc
+    ;;
+  *)
+    if test -d $srcdir/config/cpu/${host_cpu}; then
+      try_cpu=${host_cpu}
+    else
+      try_cpu=generic
+    fi
+    ;;
+esac
+
+# Now look for the file(s) usually tied to a CPU model, and make
+# default choices for those if they haven't been explicitly set
+# already.  
+cpu_include_dir="cpu/${try_cpu}"
+atomicity_include_dir=$cpu_include_dir
+
+
+# Set any OS-dependent bits.
+# Set the os_include_dir.
+# If atomic ops and/or numeric limits are OS-specific rather than
+# CPU-specifc, set those here too.
+# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
+case "${host_os}" in
+  aix4.[3456789]* | aix[56789]*)
+    # We set os_include_dir to os/aix only on AIX 4.3 and newer, but
+    # os/aix/atomicity.h works on earlier versions of AIX 4.*, so we
+    # explicitly duplicate the directory for 4.[<3].
+    os_include_dir="os/aix"
+    atomicity_include_dir="os/aix"
+    OS_LDFLAGS="-Wl,-G"
+    ;;
+  aix4.*)
+    os_include_dir="os/generic"
+    atomicity_include_dir="os/aix"
+    ;;
+  aix*)
+    os_include_dir="os/generic"
+    atomicity_include_dir="cpu/generic"
+    ;;
+  gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
+    os_include_dir="os/gnu-linux"
+    ;;
+  irix*)
+    os_include_dir="os/irix"
+    atomicity_include_dir=$os_include_dir
+    ;;
+  darwin*)
+    os_include_dir="os/macosx"
+    OS_LDFLAGS="-framework CoreAudio"
+    TRY_POSIX_SHM=yes		# POSIX shm works better on darwin
+    ;;
+  *)
+    os_include_dir="os/generic"
+    ;;
+esac
+
+
+# Set any OS-dependent and CPU-dependent bits.
+# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
+case "${host}" in
+  mips*-*-linux*)
+    atomicity_include_dir="cpu/mips"
+    ;;
+esac