luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-29 17:39:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

readline: add configure --enable-readline-bundled option

Browse Source 
Cleanup autoconf handling, should always work as expected.
Use of --enable-readline-bundled when readline is needed will use
copy in subdir.
This commit is contained in:
Darryl L. Miles
2025-10-04 20:50:31 -04:00
committed by R. Timothy Edwards
parent 2b62123459
commit 8b0616eaf5
4 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/configure.in
+34 -10
View File
@@ -1100,33 +1100,57 @@ AC_ARG_ENABLE(readline,
fi
])
use_system_readline=yes
use_bundled_readline=auto
AC_ARG_ENABLE(readline-bundled,
[ --enable-readline-bundled enable readline bundled package],
[ use_bundled_readline=yes
], [
use_bundled_readline=no
])
if test "x$enable_readline" = "xyes" ; then
AC_DEFINE(USE_READLINE)
use_system_readline=yes
AC_CHECK_LIB(readline, rl_pre_input_hook,,
if test $use_bundled_readline != yes ; then
AC_CHECK_LIB(readline, rl_pre_input_hook,[
dnl noop, prevent default action LIBS+=-lreadline
],
use_system_readline=no)
AC_CHECK_LIB(readline, rl_username_completion_function,,
AC_CHECK_LIB(readline, rl_username_completion_function,[
dnl noop, prevent default action LIBS+=-lreadline
],
use_system_readline=no)
AC_CHECK_LIB(readline, rl_filename_completion_function,,
AC_CHECK_LIB(readline, rl_filename_completion_function,[
dnl noop, prevent default action LIBS+=-lreadline
],
use_system_readline=no)
AC_CHECK_LIB(readline, rl_attempted_completion_over,,
AC_CHECK_LIB(readline, rl_attempted_completion_over,[
dnl noop, prevent default action LIBS+=-lreadline
],
use_system_readline=no)
if test $use_system_readline = yes ; then
fi
if test $use_system_readline = yes && test $use_bundled_readline != yes; then
AC_DEFINE(HAVE_READLINE)
rl_libs="-lreadline"
use_bundled_readline=
else
rl_libs="\${MAGICDIR}/readline/readline/libreadline.a"
echo "Using bundled readline"
AC_DEFINE(NEED_READLINE)
# not readline/libhistory.a (seems subset of libreadline.a)
rl_libs="\${MAGICDIR}/readline/libreadline.a"
CPPFLAGS="$CPPFLAGS -I\${MAGICDIR}/readline"
use_bundled_readline=1
fi
AC_CHECK_LIB(termcap, tgetent, [
AC_CHECK_LIB(termcap, tgetent, [
rl_libs="$rl_libs -ltermcap"
], [
AC_CHECK_LIB(ncurses, tgetent, [
rl_libs="$rl_libs -lncurses"
], )
], )
modules="$modules readline"
modules="$modules readline"
fi
else
unused="$unused readline"
fi