-############################################################# readline
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_readline="yes"
-AC_ARG_WITH(readline_headers, [AS_HELP_STRING(--with-readline-headers=dir,
- [look for libreadline header files also in dir])])
-if test -n "$with_readline_headers"; then
- readline_cppflags="-I$with_readline_headers"
- CPPFLAGS="$CPPFLAGS $readline_cppflags"
-fi
-
-AC_ARG_WITH(readline_libs, [AS_HELP_STRING(--with-readline-libs=dir,
- [look for readline library also in dir])])
-if test -n "$with_readline_libs"; then
- readline_libs="-L$with_readline_libs"
- LDFLAGS="$LDFLAGS $readline_libs"
-fi
-msg="no interactive cli support"
-AC_CHECK_HEADERS([readline/readline.h], [
- ], [
- have_readline="no"
- AC_MSG_WARN([readline/readline.h not found, $msg])
-])
-
-if test "$have_readline" = "yes"; then
- readline_ldflags="$readline_libs"
- AC_SEARCH_LIBS([rl_free_keymap], [readline], [
- readline_ldflags="$readline_ldflags -lreadline"
- ], [have_readline="no"])
- if test "$have_readline" = "no"; then # try with -lcurses
- # clear cache
- AC_MSG_NOTICE([trying again with -lcurses])
- unset ac_cv_search_rl_free_keymap 2> /dev/null
- AC_SEARCH_LIBS([rl_free_keymap], [readline], [
- have_readline=yes
- readline_ldflags="$readline_ldflags -lreadline -lcurses"
- ], [], [-lcurses])
- fi
- if test "$have_readline" = "no"; then # try with -ltermcap
- # clear cache
- AC_MSG_NOTICE([trying again with -ltermcap])
- unset ac_cv_search_rl_free_keymap 2> /dev/null
- AC_SEARCH_LIBS([rl_free_keymap], [readline], [
- have_readline=yes
- readline_ldflags="$readline_ldflags -lreadline -ltermcap"
- ], [], [-ltermcap])
- fi
-fi
-
-if test "$have_readline" = "yes"; then
- AC_CHECK_DECL(
- [rl_free_keymap],
- [AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
- [],
- [
- #include <stdio.h>
- #include <readline/readline.h>
- ]
- )
- AC_SUBST(readline_cppflags)
- AC_SUBST(readline_ldflags)
- AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
-else
- AC_MSG_WARN([libreadline not found or unusable])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+######################################################################## readline
+STASH_FLAGS
+AC_SEARCH_LIBS([tgetent], [tinfo curses terminfo termcap])
+LIB_ARG_WITH([readline], [-lreadline $LIBS])
+HAVE_READLINE=yes
+AC_CHECK_HEADER([readline/readline.h], [], [HAVE_READLINE=no])
+AC_CHECK_LIB([readline], [rl_free_keymap], [], HAVE_READLINE=no)
+AC_CHECK_DECL(
+ [rl_free_keymap],
+ [AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
+ [],
+ [
+ #include <stdio.h>
+ #include <readline/readline.h>
+ ]
+)
+LIB_SUBST_FLAGS(readline)
+UNSTASH_FLAGS