From 6f5cb5556873707d7194a5980c7a83d7e6ba8a83 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 26 Dec 2009 23:10:07 +0000
Subject: [PATCH] Made xorriso-standalone aware of libcdio system adaptor

---
 xorriso/configure_ac.txt        | 27 +++++++++++++++++++++++++++
 xorriso/xorriso_makefile_am.txt |  3 +++
 xorriso/xorriso_timestamp.h     |  2 +-
 xorriso/xorrisoburn.c           |  4 +++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/xorriso/configure_ac.txt b/xorriso/configure_ac.txt
index 6aa91d38..dcdb2c46 100644
--- a/xorriso/configure_ac.txt
+++ b/xorriso/configure_ac.txt
@@ -180,6 +180,33 @@ fi
 AC_SUBST(ZLIB_DEF)
 
 
+AC_ARG_ENABLE(libcdio,
+[  --enable-libcdio         Enable EXPERIMENTAL use of libcdio as system adapter, default=no],
+               , enable_libcdio=no)
+if test x$enable_libcdio = xyes; then
+dnl Check whether there is libcdio-devel and libcdio-runtime.
+dnl If not, erase this macro
+    LIBCDIO_DEF="-DLibburn_use_libcdiO"
+dnl The empty yes case obviously causes -lacl to be linked
+    AC_CHECK_HEADER(cdio/cdio.h, AC_CHECK_LIB(cdio, mmc_last_cmd_sense, , LIBCDIO_DEF= ), LIBCDIO_DEF= )
+else
+    LIBCDIO_DEF=
+fi
+if test x$LIBCDIO_DEF = x
+then
+    if test x$enable_libcdio = xyes
+    then
+      echo "WARNING: could not enable use of libcdio as system adapter"
+    fi
+else
+    echo "enabled  EXPERIMENTAL use of libcdio as system adapter"
+
+    LIBCDIO_REQUIRED=0.83
+    PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
+fi
+AC_SUBST(LIBCDIO_DEF)
+
+
 AC_ARG_ENABLE(external-filters,
 [  --enable-external-filters   Enable use of external filter programs by xorriso, default=yes],
                , enable_external_filters=yes)
diff --git a/xorriso/xorriso_makefile_am.txt b/xorriso/xorriso_makefile_am.txt
index e693a8ac..e7235a57 100644
--- a/xorriso/xorriso_makefile_am.txt
+++ b/xorriso/xorriso_makefile_am.txt
@@ -23,6 +23,7 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
 xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN \
                          $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
                          $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
+                         $(LIBCDIO_DEF) \
                          $(XORRISO_DVD_OBS_64K) $(LIBBURN_O_DIRECT_DEF)
 
 xorriso_xorriso_LDADD = $(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
@@ -247,7 +248,9 @@ EXTRA_DIST = \
 	libisofs/aaip-os-freebsd.c \
 	libburn/os-dummy.h \
 	libburn/os-freebsd.h \
+	libburn/os-libcdio.h \
 	libburn/os-linux.h \
 	libburn/sg-dummy.c \
 	libburn/sg-freebsd.c \
+	libburn/sg-libcdio.c \
 	libburn/sg-linux.c
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 64e62184..e5a56bdc 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.12.26.224409"
+#define Xorriso_timestamP "2009.12.26.231134"
diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c
index 2a58077c..22cc49c9 100644
--- a/xorriso/xorrisoburn.c
+++ b/xorriso/xorrisoburn.c
@@ -650,12 +650,14 @@ LIBISOBURN_MISCONFIGURATION_ = 0;
    xorriso->zlib_level= xorriso->zlib_level_default=
        zisofs_ctrl.compression_level;
  }
- 
  Xorriso_process_msg_queues(xorriso,0);
  if(reason[0]) {
    sprintf(xorriso->info_text, "%s", reason);
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);
  }
+ strcpy(xorriso->info_text, "Using ");
+ strncat(xorriso->info_text, burn_scsi_transport_id(0), 1024);
+ Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);
  free(handler_prefix);
  return(1);
 }