From e1c4ed7d17bf0399f3a4503a4a29c6054117f7f9 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 2 Oct 2008 10:55:28 +0000 Subject: [PATCH] Introduced xorriso-standalone ./configure option --disable-libreadline --- xorriso/README | 6 ++++++ xorriso/configure_ac.txt | 14 ++++++++++---- xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/xorriso/README b/xorriso/README index ffd9d9a7..46450586 100644 --- a/xorriso/README +++ b/xorriso/README @@ -74,6 +74,12 @@ The installation creates several alias links pointing to the xorriso binary: xorrecord starts xorriso with -as cdrecord emulation already enabled osirrox starts with -osirrox image-to-disk copying already enabled +If you want to avoid dependecy on libreadline although the libreadline +development package is installed, then rather build xorriso by: + ./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/xorriso/configure_ac.txt b/xorriso/configure_ac.txt index 600e12f4..9d3ec3fc 100644 --- a/xorriso/configure_ac.txt +++ b/xorriso/configure_ac.txt @@ -95,14 +95,20 @@ else CFLAGS="$CFLAGS -DDEBUG" fi - +AC_ARG_ENABLE(libreadline, +[ --enable-libreadline Enable use of libreadline [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) diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 57852ef0..91f36e21 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.10.02.092635" +#define Xorriso_timestamP "2008.10.02.105442"