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

More carefully checking for libreadline suitability

Browse Source
This commit is contained in:
Thomas Schmitt
2010-04-13 15:43:58 +00:00
parent f7ef290ac6
commit fc7cab6706
4 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,10 +145,20 @@ 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"
if test x$XORRISO_OLD_READLINE_CONFIGURE = x
then
dnl ts B00411 : To disable readline if not all needed functions are present
LIBBURNIA_ASSERT_READLINE
else
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= )
fi
else
READLINE_DEF=
fi

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

@ -1 +1 @@
#define Xorriso_timestamP "2010.04.13.103917"
#define Xorriso_timestamP "2010.04.13.154201"