Merge /home/maan/scm/paraslash_fml/paraslash

diff --combined configure.ac
index cb7ad163536eaaf8c7edfdaa4618248702e612f3,3db6082d30ce94c205c9a979cbd463070ca78eaf..fd01b188885cbb8d8d5b06b1190d7cb41d7b91e4
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -7,7 -7,14 +7,14 @@@ AC_PREREQ(2.60
  AC_INIT(paraslash, [git], maan@systemlinux.org)
  AC_CONFIG_HEADER([config.h])
  
- ########################################################################### generic
+ AC_PATH_PROG(UNAMEPATH, uname, no)
+ if test "$UNAMEPATH" = "no"; then
+       AC_MSG_ERROR(unable to determine system type)
+ fi
+ AC_MSG_CHECKING(os type)
+ OSTYPE="`$UNAMEPATH -s`"
+ AC_MSG_RESULT("$OSTYPE")
+ 
  AC_PROG_CC
  AC_PROG_CPP
  AC_PROG_INSTALL
@@@ -93,7 -100,6 +100,7 @@@ write_cmdline_objs="write.cmdline file_
  write_errlist_objs="write write_common file_write time fd string sched stdin"
  write_ldflags=""
  writers=" file"
 +default_writer="FILE_WRITE"
  
  client_cmdline_objs="client.cmdline"
  client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
@@@ -185,7 -191,6 +192,7 @@@ if test ${have_core_audio} = yes; the
        write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
        write_ldflags="$write_ldflags $f"
        writers="$writers osx"
 +      default_writer="OSX_WRITE"
        AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
  fi
  ########################################################################### gtk2
@@@ -278,6 -283,9 +285,9 @@@ AC_CHECK_HEADERS([ogg/ogg.h vorbis/code
  if test "$have_ogg" = "yes"; then
        AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support)
        filters="$filters oggdec"
+       if test "$OSTYPE" = "Darwin"; then
+               oggvorbis_libs="-Wl,-bind_at_load  $oggvorbis_libs"
+       fi
        server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
        filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
        audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
@@@ -407,7 -415,6 +417,7 @@@ if test "$have_alsa" = "yes"; the
        write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
        write_ldflags="$write_ldflags -lasound"
        writers="$writers alsa"
 +      default_writer="ALSA_WRITE"
  fi
  CPPFLAGS="$OLD_CPPFLAGS"
  LDFLAGS="$OLD_LDFLAGS"
@@@ -535,7 -542,6 +545,7 @@@ AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS
  enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
  AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
 +AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
  names="$(for i in $writers; do printf \"$i\",' ' ; done)"
  AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
  inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"