From c286bec8ee379e05816aa37a9af4e0d1227b0c8c Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Mon, 3 May 2004 03:22:24 +0000
Subject: [PATCH] Another patch from Heiner Eichmann.

---
 configure.ac          | 5 +++--
 lib/FreeBSD/freebsd.c | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index e2ea26a6..699dd2d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 69)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.74 2004/04/22 03:24:38 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.75 2004/05/03 03:22:51 rocky Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 AM_INIT_AUTOMAKE
@@ -50,7 +50,7 @@ enable_versioned_libs="${withval}", enable_versioned_libs=yes)
 dnl Checks for programs.
 AC_PROG_CC
 
-cd_drivers='BIN/CUE, NRG'
+cd_drivers='CDRDAO, BIN/CUE, NRG'
 
 if test "x$GCC" != "xyes" 
 then
@@ -287,6 +287,7 @@ int has_timeout=sizeof(test.timeout);],
      freebsd4.*)
      	AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
                   [Define 1 if you have FreeBSD CD-ROM support])
+ 	LIBS="$LIBS -lcam"
   	cd_drivers="${cd_drivers}, FreeBSD "
 	;;
      *)
diff --git a/lib/FreeBSD/freebsd.c b/lib/FreeBSD/freebsd.c
index 85916324..d4d169fa 100644
--- a/lib/FreeBSD/freebsd.c
+++ b/lib/FreeBSD/freebsd.c
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd.c,v 1.4 2004/05/02 14:55:11 rocky Exp $
+    $Id: freebsd.c,v 1.5 2004/05/03 03:22:24 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: freebsd.c,v 1.4 2004/05/02 14:55:11 rocky Exp $";
+static const char _rcsid[] = "$Id: freebsd.c,v 1.5 2004/05/03 03:22:24 rocky Exp $";
 
 #include "freebsd.h"
 
@@ -97,7 +97,7 @@ _read_mode2_sector_freebsd (void *env, void *data, lsn_t lsn,
   if ( _obj->access_mode == _AM_CAM )
     return read_mode2_sector_freebsd_ioctl(_obj, data, lsn, b_form2);
   else
-    return read_mode2_sector_freebsd_cam(_obj, data, lsn, b_form2);
+    return read_mode2_sectors_freebsd_cam(_obj, data, lsn, 1, b_form2);
 }
 
 /*!