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

Clarified configuration and license aspects of libreadline and libedit

Browse Source
This commit is contained in:
Thomas Schmitt 2014-06-15 12:56:43 +00:00
parent 8b236d1632
commit b939ae9f93
5 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libisoburn/trunk/README
View File

@ -98,11 +98,18 @@ 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
By default libisoburn will depend on libreadline if the library and its
development header files are present at compile time. If not, then it will
try to depend on libedit and its header file.
Both conditional dependencies can be avoided by running
./configure --prefix=/usr --disable-libreadline
make clean ; make
Never omit the "make clean" command after switching libreadline enabling.
Never omit the "make clean" command after switching enabling of libreadline.
Note that depending on libreadline-6 will cause libisoburn's license to
become "GPL version 3 or later".
If you want to explictely allow only the use of libedit, then do
./configure --prefix=/usr --disable-libreadline --enable-libedit
Other deliberate dependency reduction options of ./configure are:
--disable-libacl avoid use of ACL functions like acl_to_text()
--disable-xattr avoid use of xattr functions like listxattr() on Linux

14
libisoburn/trunk/configure.ac
View File

@ -143,20 +143,26 @@ dnl The X= in the yes case prevents that -lreadline gets linked twice
fi
else
READLINE_DEF=
echo "disabled libreadline"
fi
if test x$READLINE_DEF = x; then
if test x$enable_libreadline = xyes; then
libedit_deflt=yes
else
libedit_deflt=no
fi
AC_ARG_ENABLE(libedit,
[ --enable-libedit Enable use of libedit by xorriso if not libreadline, default=yes],
, enable_libedit=yes)
[ --enable-libedit Enable use of libedit by xorriso if not libreadline,
default= setting of --enable-libreadline],
, enable_libedit=$libedit_deflt)
if test x$enable_libedit = xyes; then
dnl Check whether there is development and runtime support.
dnl If not, erase this macro which would enable use of el_*(), history*()
READLINE_DEF="-DXorriso_with_editlinE"
LIBBURNIA_ASSERT_EDITLINE
else
READLINE_DEF=
echo "disabled libedit"
fi
fi
AC_SUBST(READLINE_DEF)

16
libisoburn/trunk/xorriso/README_gnu_xorriso
View File

@ -41,7 +41,8 @@ components:
libc, libpthread
plus on FreeBSD: libiconv, libcam, IDE and SATA drives need atapicam
Optional at compile time are:
libreadline and the readline-dev headers make dialog mode more convenient.
libreadline and the readline-dev headers, or libedit and its header,
make dialog mode more convenient.
zlib and zlib-devel allow zisofs compression.
on GNU/Linux: libacl and libacl-devel allow getting and setting ACLs.
If they were present at compile time, then the optional libraries have to
@ -90,11 +91,16 @@ The installation creates several alias links pointing to the xorriso binary:
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
By default xorriso will depend on libreadline if the library and its
development header files are present at compile time. If not, then it will
try to depend on libedit and its header file.
Both conditional dependencies can be avoided by running
./configure --prefix=/usr --disable-libreadline
make clean ; make
Never omit the "make clean" command after switching libreadline enabling.
Never omit the "make clean" command after switching enabling of libreadline.
If you want to explictely allow only the use of libedit, then do
./configure --prefix=/usr --disable-libreadline --enable-libedit
Other deliberate dependency reduction options of ./configure are:
--disable-libacl avoid use of ACL functions like acl_to_text()
--disable-xattr avoid use of xattr functions like listxattr() on Linux

13
libisoburn/trunk/xorriso/configure_ac.txt
View File

@ -173,22 +173,27 @@ dnl The X= in the yes case prevents that -lreadline gets linked twice
fi
else
READLINE_DEF=
echo "disabled libreadline"
fi
if test x$READLINE_DEF = x; then
AH_TEMPLATE([Xorriso_with_editlinE],
[Define to use libedit if not libreadline])
if test x$enable_libreadline = xyes; then
libedit_deflt=yes
else
libedit_deflt=no
fi
AC_ARG_ENABLE(libedit,
[ --enable-libedit Enable use of libedit by xorriso if not libreadline, default=yes],
, enable_libedit=yes)
[ --enable-libedit Enable use of libedit by xorriso if not libreadline, default= setting of --enable-libreadline],
, enable_libedit=$libedit_deflt)
if test x$enable_libedit = xyes; then
dnl Check whether there is development and runtime support.
dnl If not, erase this macro which would enable use of el_*(), history*()
READLINE_DEF="-DXorriso_with_editlinE"
LIBBURNIA_ASSERT_EDITLINE
else
READLINE_DEF=
echo "disabled libedit"
fi
fi
if test x$READLINE_DEF = x-DXorriso_with_readlinE

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2014.06.15.094311"
#define Xorriso_timestamP "2014.06.15.125555"