diff -rc ../old/cdrdao-1.1.4/configure ./configure *** ../old/cdrdao-1.1.4/configure Sun Aug 27 13:37:08 2000 --- ./configure Fri Oct 20 10:32:47 2000 *************** *** 3234,3239 **** --- 3234,3240 ---- + xdao=no if test $xdao != xdao; then xdao= *************** *** 3263,3269 **** scsi_if_src=ScsiIf-lib.cc case "$host" in ! *-freebsd3* | *-freebsd4*) scsilib_libs="$scsilib_libs -lcam" ;; esac --- 3264,3270 ---- scsi_if_src=ScsiIf-lib.cc case "$host" in ! *-freebsd3* | *-freebsd4* | *-freebsd5*) scsilib_libs="$scsilib_libs -lcam" ;; esac *************** *** 3279,3285 **** scsi_if_src="ScsiIf-linux.cc sg_err.cc" ;; ! *-freebsd3* | *-freebsd4*) scsi_if_src="ScsiIf-freebsd-cam.cc" scsilib_libs="-lcam" ;; --- 3280,3286 ---- scsi_if_src="ScsiIf-linux.cc sg_err.cc" ;; ! *-freebsd3* | *-freebsd4* | *-freebsd5*) scsi_if_src="ScsiIf-freebsd-cam.cc" scsilib_libs="-lcam" ;; *************** *** 3311,3317 **** esac case "$host" in ! *-linux-*) sound_if_src=SoundIF-linux.cc ;; --- 3312,3318 ---- esac case "$host" in ! *-linux-* | *-freebsd*) sound_if_src=SoundIF-linux.cc ;; diff -rc ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc ./xdao/SoundIF-linux.cc *** ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc Sun Aug 27 13:37:11 2000 --- ./xdao/SoundIF-linux.cc Fri Oct 20 10:32:22 2000 *************** *** 34,40 **** --- 34,47 ---- * */ + # if defined(__FreeBSD__) + #include + # if !defined(SNDCTL_DSP_CHANNELS) + # define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO + # endif + # else #include + # endif #include #include