|
|
|
@ -77,16 +77,16 @@ if test x$LIBISOBURN_OLD_ICONV_CONFIGURE = x
|
|
|
|
|
then
|
|
|
|
|
|
|
|
|
|
dnl ts B00410 : To detect the need for -liconv and const argument of iconv()
|
|
|
|
|
LIBBURNIA_CHECK_ICONV
|
|
|
|
|
LIBBURNIA_CHECK_ICONV
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
dnl Outdated: produces double -liconv and warnings about parameter mismatch
|
|
|
|
|
dnl If iconv(3) is in an extra lib, then it gets added to variable LIBS.
|
|
|
|
|
dnl If not, then no -liconv will be added.
|
|
|
|
|
AC_CHECK_LIB(iconv, iconv, , )
|
|
|
|
|
AC_CHECK_LIB(iconv, iconv, , )
|
|
|
|
|
dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
|
|
|
|
|
AC_CHECK_LIB(iconv, libiconv, , )
|
|
|
|
|
AC_CHECK_LIB(iconv, libiconv, , )
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
@ -120,10 +120,19 @@ 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
|
|
|
|
|