default to --without-server on mac

diff --git a/README b/README
index 538aee4f526418994407193a4f9be9cd4814754b..df198035b860919b64858072c6414a2307995538 100644 (file)
--- a/README
+++ b/README
@@ -105,12 +105,6 @@ NOTE: If you are upgrading from an earlier version, see README.upgrades.
    Do not use a general-purpose user or group, you must create ones
    specifically for DisOrder.
 
    Do not use a general-purpose user or group, you must create ones
    specifically for DisOrder.
 

-   Under OS X, make sure that ~jukebox/Library/Logs/CrashReporter/ (or
-   whatever) exists and is writable by the jukebox user.
-
-     mkdir -p ~jukebox/Library/Logs/CrashReporter
-     chown -R jukebox:jukebox ~jukebox/Library
-

 4. Create /etc/disorder/config.  Start from examples/config.sample and adapt it
    to your own requirements.  In particular, you should:
     * add 'player' commands for any file formats not supported natively
 4. Create /etc/disorder/config.  Start from examples/config.sample and adapt it
    to your own requirements.  In particular, you should:
     * add 'player' commands for any file formats not supported natively


@@ -154,16 +148,6 @@ NOTE: If you are upgrading from an earlier version, see README.upgrades.
    suitable; install it in /etc/init.d, adapting it as necessary, and make
    appropriate links from /etc/rc[0-6].d.
 
    suitable; install it in /etc/init.d, adapting it as necessary, and make
    appropriate links from /etc/rc[0-6].d.
 

-   For Mac OS X 10.4, you can install server/uk.org.greenend.rjk.disorder.plist
-   into /Library/LaunchDaemons.  Having done this reload the contents:
-
-    sudo launchctl load /Library/LaunchDaemons
-
-   Note that the RunAtLoad key has been deliberately commented out, if you want
-   to start the server at boot time you must edit this.
-
-   If you have a some other init system then you are on your own.
-

 7. Make sure the state directory (/var/disorder or /usr/local/var/disorder or
    as determined by configure) exists and is writable by the jukebox user.
 
 7. Make sure the state directory (/var/disorder or /usr/local/var/disorder or
    as determined by configure) exists and is writable by the jukebox user.
 


@@ -179,10 +163,6 @@ NOTE: If you are upgrading from an earlier version, see README.upgrades.
 
      /etc/init.d/disorder start
 
 
      /etc/init.d/disorder start
 

-   On Mac OS X 10.4:
-
-     sudo launchctl start uk.org.greenend.rjk.disorder
-

    By default disorderd logs to daemon.*; check your syslog.conf to see where
    this ends up and look for log messages from disorderd there.  If it didn't
    start up correctly there should be an error message.  Correct the problem
    By default disorderd logs to daemon.*; check your syslog.conf to see where
    this ends up and look for log messages from disorderd there.  If it didn't
    start up correctly there should be an error message.  Correct the problem

diff --git a/README.mac b/README.mac
new file mode 100644 (file)
index 0000000..137b155
--- /dev/null
+++ b/README.mac
@@ -0,0 +1,29 @@
+DisOrder on OS X
+================
+
+The server builds on OS X.  However the kernel panics when I run it
+(kernel 8.10.1).  Until Apple can provide a stable operating system,
+it is not recommended that you run the server on this platform.
+
+
+Things you will need to do:
+
+Make sure that ~jukebox/Library/Logs/CrashReporter/ (or whatever)
+exists and is writable by the jukebox user.
+
+     mkdir -p ~jukebox/Library/Logs/CrashReporter
+     chown -R jukebox:jukebox ~jukebox/Library
+
+Install server/uk.org.greenend.rjk.disorder.plist into
+/Library/LaunchDaemons.  Having done this reload the contents:
+
+    sudo launchctl load /Library/LaunchDaemons
+
+Note that the RunAtLoad key has been deliberately commented out, if
+you want to start the server at boot time you must edit this.  Given
+that at the time of writing this risks causing boot-time kernel
+panics, only do this if you are feeling brave.
+
+To start the server:
+
+     sudo launchctl start uk.org.greenend.rjk.disorder

diff --git a/configure.ac b/configure.ac
index af15c83ec8229eb742ea04bc6c641ca9666ba58d..8b07fd83b1c23a9773fc312e978b1722a9097415 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,20 +29,22 @@ AM_CONFIG_HEADER([config.h])
 AC_CANONICAL_HOST
 
 # What we want to build
 AC_CANONICAL_HOST
 
 # What we want to build

-want_server=yes

 want_gtk=yes
 want_python=yes
 
 case "$host" in
 *linux* | *Linux* )
   want_alsa=yes
 want_gtk=yes
 want_python=yes
 
 case "$host" in
 *linux* | *Linux* )
   want_alsa=yes

+  want_server=yes

   ;;
 *-apple-darwin* )
   want_alsa=no
   ;;
 *-apple-darwin* )
   want_alsa=no

+  want_server=no

   COREAUDIO="-framework CoreAudio"
   ;;
 * )
   want_alsa=no
   COREAUDIO="-framework CoreAudio"
   ;;
 * )
   want_alsa=no

+  want_server=no

   ;;
 esac
 AC_SUBST([COREAUDIO])
   ;;
 esac
 AC_SUBST([COREAUDIO])