From 2b00760bcfbdd420de7d1f931840f5b36403499a Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 9 Oct 2008 15:00:11 +0000 Subject: [PATCH] Introduced libburn ./configure option --disable-libreadline --- libisoburn/trunk/README | 6 ++++++ libisoburn/trunk/configure.ac | 14 ++++++++++---- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libisoburn/trunk/README b/libisoburn/trunk/README index 0b044f15..6465e4f1 100644 --- a/libisoburn/trunk/README +++ b/libisoburn/trunk/README @@ -72,6 +72,12 @@ Several alias links point to the xorriso binary: xorrecord starts xorriso with -as cdrecord emulation already enabled osirrox starts with -osirrox image-to-disk copying already enabled +By default xorriso will depend on libreadline if the readline-dev headers +are present. This dependcy can be avoided by running + ./configure --prefix=/usr --disable-libreadline + make clean ; make +Never omit the "make clean" command after switching libreadline enabling. + Drives and Disk File Objects diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index ff88415b..fd0668d7 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -86,16 +86,22 @@ AC_SUBST(ARCH) AC_SUBST(LIBBURN_ARCH_LIBS) +AC_ARG_ENABLE(libreadline, +[ --enable-libreadline Enable use of libreadline by xorriso, default=yes], + , enable_libreadline=yes) +if test x$enable_libreadline = xyes; then dnl Check whether there is readline-devel and readline-runtime. dnl If not, erase this macro which would enable use of readline(),add_history() -READLINE_DEF="-DXorriso_with_readlinE" + READLINE_DEF="-DXorriso_with_readlinE" dnl The empty yes case obviously causes -lreadline to be linked -AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= ) + AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= ) dnl The X= in the yes case prevents that -lreadline gets linked twice -AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= ) + AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= ) +else + READLINE_DEF= +fi AC_SUBST(READLINE_DEF) - AC_CHECK_HEADER(libburn/libburn.h) AC_CHECK_HEADER(libisofs/libisofs.h) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 25a94672..050f7a4a 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.10.08.135848" +#define Xorriso_timestamP "2008.10.09.145926"