CVS: rdesktop configure,1.29,1.30

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28685

Modified Files:
	configure 
Log Message:
Make it possible to select the audio-output for configure
There are some-systems which have both header files installed...


Index: configure
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** configure	14 Feb 2004 22:54:38 -0000	1.29
--- configure	9 Mar 2004 22:50:16 -0000	1.30
***************
*** 17,20 ****
--- 17,21 ----
  ldflags=''
  rpath=
+ withsound='yes'
  
  for arg in $*; do
***************
*** 71,74 ****
--- 72,87 ----
      cflags="$cflags -DIPv6"
      ;;
+   --without-sound*)
+     withsound=no
+     ;;
+   --with-sound)
+     withsound=yes
+     ;;
+   --with-sound=oss)
+     withsound=$optarg
+     ;;
+   --with-sound=sun)
+     withsound=$optarg
+     ;;
    *)
      echo "Target directories:"
***************
*** 92,95 ****
--- 105,110 ----
      echo " --with-debug-clipboard  enable debugging of clipboard code"
      echo " --with-ipv6             enable support for IPv6"
+     echo " --without-sound         disable support for sound redirection"
+     echo " --with-sound=ARG        only detect sound-support for \"oss\" or \"sun\" (and BSD)"
      echo
      rm -f Makeconf
***************
*** 264,273 ****
  # Check for OSS sound support
  
! if [ -f /usr/include/sys/soundcard.h ]; then
      echo Sound support enabled: Open Sound System
      echo
      echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
      cflags="$cflags -DWITH_RDPSND"
! elif [ -f /usr/include/sys/audioio.h ]; then
      echo Sound support enabled: Sun/BSD
      echo
--- 279,288 ----
  # Check for OSS sound support
  
! if [ -f /usr/include/sys/soundcard.h -a \( "$withsound" = "yes" -o "$withsound" = "oss" \) ]; then
      echo Sound support enabled: Open Sound System
      echo
      echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
      cflags="$cflags -DWITH_RDPSND"
! elif [ -f /usr/include/sys/audioio.h -a \( "$withsound" = "yes" -o "$withsound" = "sun" \) ]; then
      echo Sound support enabled: Sun/BSD
      echo
***************
*** 276,280 ****
  else
      echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audioio.h)"
!     echo "Currently supported systems are Open Sound System and Sun"
      echo
  fi
--- 291,295 ----
  else
      echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audioio.h)"
!     echo "Currently supported systems are Open Sound System (oss) and Sun/BSD (sun)"
      echo
  fi



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click