Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-03 23:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from sureshsundriyal/wip

Browse Source 
More refactoring and autogen run.
This commit is contained in:
Suresh Sundriyal 2015-03-27 04:51:52 -07:00
commit ab257af0c7
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -7747,8 +7747,7 @@ for ac_lib in '' readline; do
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $CURSES_LIB
$ac_func_search_save_LIBS"
LIBS="-l$ac_lib $CURSES_LIB $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_readline=$ac_res
@ -7830,7 +7829,7 @@ for ac_lib in '' readline; do
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
LIBS="-l$ac_lib $CURSES_LIB $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_history_set_history_state=$ac_res
@ -7857,8 +7856,6 @@ if test "$ac_res" != no; then :
else
as_fn_error $? "libreadline does not have the required symbols. editline possibly masquerading as readline." "$LINENO" 5
$CURSES
fi
@ -7940,7 +7937,7 @@ for ac_lib in '' sqlite3; do
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
LIBS="-l$ac_lib -pthread $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_sqlite3_open=$ac_res
@ -7967,7 +7964,6 @@ if test "$ac_res" != no; then :
SQLITE3_LIBS="-lsqlite3"
else
as_fn_error $? "sqlite3 library not found" "$LINENO" 5
fi

4
m4/lnav_with_readline.m4
View File

@ -58,7 +58,7 @@ AC_DEFUN([AX_PATH_LIB_READLINE],
AC_SEARCH_LIBS([readline], [readline],
[AS_VAR_SET([READLINE_LIBS], ["-lreadline"])],
[AC_MSG_ERROR([libreadline library not found])],
[$CURSES_LIB]
[$CURSES_LIB]dnl
)dnl
AC_CHECK_HEADERS([readline.h readline/readline.h],
@ -78,7 +78,7 @@ AC_DEFUN([AX_PATH_LIB_READLINE],
AC_SEARCH_LIBS([history_set_history_state], [readline],
[],
AC_MSG_ERROR([libreadline does not have the required symbols. editline possibly masquerading as readline.]),
[$CURSES_LIB]
[$CURSES_LIB]dnl
)
AC_SUBST([READLINE_LIBS])

6
m4/lnav_with_sqlite3.m4
View File

@ -32,13 +32,11 @@ AC_DEFUN([LNAV_WITH_SQLITE3],
]
)
AS_VAR_SET([saved_LDFLAGS], [$LDFLAGS])
LNAV_ADDTO([LDFLAGS], [-pthread])
AC_SEARCH_LIBS([sqlite3_open], [sqlite3],
AS_VAR_SET([SQLITE3_LIBS], ["-lsqlite3"]),
AC_MSG_ERROR([sqlite3 library not found])
AC_MSG_ERROR([sqlite3 library not found]),
[-pthread]dnl
)
AS_VAR_SET([LDFLAGS], [$saved_LDFLAGS])
AC_CHECK_HEADERS([sqlite3.h], [],
AC_MSG_ERROR([sqlite3 headers not found])