Changeset 927:7abaadb408b0 in roaraudio

Timestamp:

12/07/08 14:24:48 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

add support to configure to find the correct audio group

Files:

• configure (modified) (5 diffs)
• include/roaraudio.h (modified) (1 diff)

configure

@@ -32 +32 @@
 OSS_DEV="none"
 PROC_NET_DECNET="/proc/net/decnet"
+
+DEFAULT_GRP=''
 
 AO_INST_DIR=''
@@ -110 +112 @@
    shift;
   ;;
+  '--audio-group')
+   DEFAULT_GRP="$2"
+   shift;
+  ;;
   '--no-'*)
    lib=$(echo "$1" | sed 's/^--no-//')
@@ -271 +277 @@
 elif [ "$SYSNAME" = 'FreeBSD' ]
 then
+ echo "Adding $SYSNAME search path arguments..."
  LDPATH="$LDPATH -L/usr/local/lib/"
  INCPATH="$INCPATH -I/usr/local/include/"
+ [ "$DEFAULT_GRP" = '' ] && DEFAULT_GRP='wheel'
 fi
 
@@ -279 +287 @@
 [ "$PREFIX_INC" = '' ] && PREFIX_INC="$PREFIX/include/"
 [ "$PREFIX_MAN" = '' ] && PREFIX_MAN="$PREFIX/share/man/"
+
+[ "$DEFAULT_GRP" = '' ] && DEFAULT_GRP='audio'
 
 # now write the cc name to Makefile.conf
@@ -538 +548 @@
 echo '#define ROAR_PROC_NET_DECNET "'"$PROC_NET_DECNET"'"' >&3
 
+
+echo 'checking for default audio group... '"$DEFAULT_GRP"
+echo '#define ROAR_DEFAULT_SOCKGRP "'"$DEFAULT_GRP"'"' >&3
+
 cat >&3 << EOF
 

include/roaraudio.h

@@ -103 +103 @@
 #define ROAR_DEFAULT_LISTEN_OBJECT "::" ROAR_DEFAULT_OBJECT
 
-#define ROAR_DEFAULT_SOCKGRP     "audio"
+// now handled by condiguere
+//#define ROAR_DEFAULT_SOCKGRP     "audio"
 
 #define ROAR_LIBS                "-lroar"