libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made xorriso-standalone aware of libcdio system adaptor

Browse Source
This commit is contained in:
Thomas Schmitt 2009-12-26 23:10:07 +00:00
parent 2669117d84
commit 6f5cb55568
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xorriso/configure_ac.txt
View File

@ -180,6 +180,33 @@ fi
AC_SUBST(ZLIB_DEF) 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, AC_ARG_ENABLE(external-filters,
[ --enable-external-filters Enable use of external filter programs by xorriso, default=yes], [ --enable-external-filters Enable use of external filter programs by xorriso, default=yes],
, enable_external_filters=yes) , enable_external_filters=yes)

3
xorriso/xorriso_makefile_am.txt
View File

@ -23,6 +23,7 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN \ xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN \
$(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \ $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
$(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \ $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
$(LIBCDIO_DEF) \
$(XORRISO_DVD_OBS_64K) $(LIBBURN_O_DIRECT_DEF) $(XORRISO_DVD_OBS_64K) $(LIBBURN_O_DIRECT_DEF)
xorriso_xorriso_LDADD = $(THREAD_LIBS) $(LIBBURN_ARCH_LIBS) xorriso_xorriso_LDADD = $(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
@ -247,7 +248,9 @@ EXTRA_DIST = \
libisofs/aaip-os-freebsd.c \ libisofs/aaip-os-freebsd.c \
libburn/os-dummy.h \ libburn/os-dummy.h \
libburn/os-freebsd.h \ libburn/os-freebsd.h \
libburn/os-libcdio.h \
libburn/os-linux.h \ libburn/os-linux.h \
libburn/sg-dummy.c \ libburn/sg-dummy.c \
libburn/sg-freebsd.c \ libburn/sg-freebsd.c \
libburn/sg-libcdio.c \
libburn/sg-linux.c libburn/sg-linux.c

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2009.12.26.224409" #define Xorriso_timestamP "2009.12.26.231134"

4
xorriso/xorrisoburn.c
View File

@ -650,12 +650,14 @@ LIBISOBURN_MISCONFIGURATION_ = 0;
xorriso->zlib_level= xorriso->zlib_level_default= xorriso->zlib_level= xorriso->zlib_level_default=
zisofs_ctrl.compression_level; zisofs_ctrl.compression_level;
} }
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
if(reason[0]) { if(reason[0]) {
sprintf(xorriso->info_text, "%s", reason); sprintf(xorriso->info_text, "%s", reason);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0); 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); free(handler_prefix);
return(1); return(1);
} }