lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only mdb-sql depends on readline

Browse Source
This commit is contained in:
whydoubt 2005-03-29 03:33:23 +00:00
parent 6587feb47e
commit d1a6f47bfb
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Mar 28 21:31:36 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* acinclude.m4:
* src/util/Makefile.am: Only mdb-sql depends on readline
Sun Mar 27 21:32:00 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/file.c: Fix segfault on file-not-found
Tue Mar 22 21:51:06 CST 2005 Jeff Smith <whydoubt@yahoo.com>

31
acinclude.m4
View File

@ -4,42 +4,43 @@ AC_DEFUN([VL_LIB_READLINE], [
ORIG_LIBS="$LIBS"
for readline_lib in readline edit editline; do
for termcap_lib in "" termcap curses ncurses; do
if test -z "$termcap_lib"; then
TRY_LIB="-l$readline_lib"
else
TRY_LIB="-l$readline_lib -l$termcap_lib"
TRY_LIB="-l$readline_lib"
if test -n "$termcap_lib"; then
TRY_LIB="$TRY_LIB -l$termcap_lib"
fi
LIBS="$ORIG_LIBS $TRY_LIB"
AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline="$TRY_LIB")
if test -n "$vl_cv_lib_readline"; then
AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline=yes)
if test "$vl_cv_lib_readline" = yes; then
break
fi
done
if test -n "$vl_cv_lib_readline"; then
if test "$vl_cv_lib_readline" = yes; then
break
fi
done
if test -z "$vl_cv_lib_readline"; then
vl_cv_lib_readline="no"
LIBS="$ORIG_LIBS"
fi
])
if test "$vl_cv_lib_readline" != "no"; then
if test "$vl_cv_lib_readline" = yes; then
AC_DEFINE(HAVE_LIBREADLINE, 1,
[Define if you have a readline compatible library])
AC_CHECK_HEADERS(readline.h readline/readline.h)
AC_CACHE_CHECK([whether readline supports history],
vl_cv_lib_readline_history, [
vl_cv_lib_readline_history="no"
AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history=yes)
])
if test "$vl_cv_lib_readline_history" = "yes"; then
if test "$vl_cv_lib_readline_history" = yes; then
AC_DEFINE(HAVE_READLINE_HISTORY, 1,
[Define if your readline library has \`add_history'])
AC_CHECK_HEADERS(history.h readline/history.h)
fi
fi
LIBS="$ORIG_LIBS"
LIBREADLINE=
if test "$vl_cv_lib_readline" = yes; then
LIBREADLINE="$TRY_LIB"
fi
AC_SUBST(LIBREADLINE)
])dnl
dnl From Bruno Haible.

2
src/util/Makefile.am
View File

@ -4,5 +4,5 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
LDADD = ../libmdb/libmdb.la
if SQL
mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la $(LIBREADLINE)
endif