Changeset 2421:4ecee4562238 in roaraudio

Timestamp:

08/18/09 15:42:36 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added patch to support forcefully setting of non existing device names, bug report by Simon Matter

File:

• configure (modified) (5 diffs)

configure

@@ -39 +39 @@
 
 CDROM_IS_DEV=true
-CDROM="none"
-OSS_DEV="none"
+CDROM=""
+OSS_DEV=""
 PROC_NET_DECNET="/proc/net/decnet"
-TTY_DEV="none"
+TTY_DEV=""
 
 VORBIS_BITS=32
@@ -156 +156 @@
    echo '--cdrom DEV                 - Set default CDRum device'
    echo '--tty DEV                   - Set default TTY'
+   echo '--oss-dev DEV               - Set default OSS device'
    echo '--proc-net-decnet FILE      - Set DECnet file for DECnet support auto detecting'
    echo '                              (ignore this on non-Linux)'
@@ -1326 +1327 @@
 
 echo -n 'checking for cdrom device... '
-if [ -e "$CDROM" ]
-then
- echo "$CDROM"
- echo '#define ROAR_DEFAULT_CDROM "'"$CDROM"'"' >&3
- echo '#define ROAR_HAVE_CDROM' >&3
+if [ -n "$CDROM" ]
+then
+ if [ "$CDROM" = '(none)' ]
+ then
+  echo "none (disabled by user)"
+ else
+  if $CROSS_COMPILE
+  then
+   echo "$CDROM (cross compile)"
+  elif [ -e "$CDROM" ]
+  then
+   echo "$CDROM (forced by user)"
+  else
+   echo "$CDROM (not existing, forced by user)"
+  fi
+  echo '#define ROAR_DEFAULT_CDROM "'"$CDROM"'"' >&3
+  echo '#define ROAR_HAVE_CDROM' >&3
+ fi
 elif $CROSS_COMPILE
 then
@@ -1348 +1362 @@
 
 echo -n 'checking for default tty device... '
-if [ -e "$TTY_DEV" ]
-then
- echo "$TTY_DEV"
- echo '#define ROAR_DEFAULT_TTY "'"$TTY_DEV"'"' >&3
+if [ -n "$TTY_DEV" ]
+then
+ if [ "$TTY_DEV" = '(none)' ]
+ then
+  echo "none (disabled by user)"
+ else
+  if $CROSS_COMPILE
+  then
+   echo "$TTY_DEV (cross compile)"
+  elif [ -e "$TTY_DEV" ]
+  then
+   echo "$TTY_DEV (forced by user)"
+  else
+   echo "$TTY_DEV (not existing, forced by user)"
+  fi
+  echo '#define ROAR_DEFAULT_TTY "'"$TTY_DEV"'"' >&3
+ fi
 else
  TTY_DEV=$(ls /dev/tty 2> /dev/null | head -n 1);
@@ -1364 +1391 @@
 
 echo -n 'checking for OSS device... '
-if [ -e "$OSS_DEV" ]
-then
- echo "$OSS_DEV"
- echo '#define ROAR_DEFAULT_OSS_DEV "'"$OSS_DEV"'"' >&3
+if [ -n "$OSS_DEV" ]
+then
+ if [ "$OSS_DEV" = '(none)' ]
+ then
+  echo "none (disabled by user)"
+ else
+  if $CROSS_COMPILE
+  then
+   echo "$OSS_DEV (cross compile)"
+  elif [ -e "$TTY_DEV" ]
+  then
+   echo "$OSS_DEV (forced by user)"
+  else
+   echo "$OSS_DEV (not existing, forced by user)"
+  fi
+  echo '#define ROAR_DEFAULT_OSS_DEV "'"$OSS_DEV"'"' >&3
+ fi
 else
  OSS_DEV=$(ls /dev/dsp /dev/audio 2> /dev/null | head -n 1);