From 58f80dad5ffd0dac31b8052b627532f572aa8012 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 2 Oct 2012 13:47:05 +0000 Subject: [PATCH] Configuration for use of libcdio on cygwin. Thanks Rocky Bernstein. --- configure.ac | 14 +++++++++++--- xorriso/configure_ac.txt | 14 +++++++++++--- xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index c5b599e2..f8dc0e29 100644 --- a/configure.ac +++ b/configure.ac @@ -212,9 +212,17 @@ dnl ts B00107 dnl Just for the case that it is necessary to give link option -lcdio not only dnl with libburn but also with libburn apps like xorriso. dnl On SuSE 10.2 this is not needed. libburn finds libcdio on its own. +case $host_os in + cygwin*|mingw*) + default_libcdio=yes + ;; + *) + default_libcdio=no + ;; +esac AC_ARG_ENABLE(libcdio, -[ --enable-libcdio Enable EXPERIMENTAL use of libcdio as system adapter, default=no], - , enable_libcdio=no) +[ --enable-libcdio Enable use of libcdio as system adapter, default=no (except on MSWindows)], + , enable_libcdio=$default_libcdio) if test x$enable_libcdio = xyes; then dnl Check whether there is libcdio-devel and libcdio-runtime. dnl If not, erase this macro @@ -231,7 +239,7 @@ then echo "WARNING: could not enable use of libcdio as system adapter" fi else - echo "enabled EXPERIMENTAL use of libcdio as system adapter" + echo "enabled use of libcdio as system adapter" fi AC_SUBST(LIBCDIO_DEF) diff --git a/xorriso/configure_ac.txt b/xorriso/configure_ac.txt index 6068c041..4bb78b80 100644 --- a/xorriso/configure_ac.txt +++ b/xorriso/configure_ac.txt @@ -307,10 +307,18 @@ then fi +case $host_os in + cygwin*|mingw*) + default_libcdio=yes + ;; + *) + default_libcdio=no + ;; +esac AH_TEMPLATE([Libburn_use_libcdiO], [Define to use libcdio as system adapter]) AC_ARG_ENABLE(libcdio, -[ --enable-libcdio Enable EXPERIMENTAL use of libcdio as system adapter, default=no], - , enable_libcdio=no) +[ --enable-libcdio Enable use of libcdio as system adapter, default=no (except on MSWindows)], + , enable_libcdio=$default_libcdio) if test x$enable_libcdio = xyes; then dnl Check whether there is libcdio-devel and libcdio-runtime. dnl If not, erase this macro @@ -327,7 +335,7 @@ then echo "WARNING: could not enable use of libcdio as system adapter" fi else - echo "enabled EXPERIMENTAL use of libcdio as system adapter" + echo "enabled use of libcdio as system adapter" fi if test x$LIBCDIO_DEF = x-DLibburn_use_libcdiO then diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 2e0e3012..e86103c7 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.09.29.173546" +#define Xorriso_timestamP "2012.10.02.134601"