Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ncurses without config

This commit is contained in:
Frank Celler 2012-01-11 17:29:07 +01:00
parent e841792ce3
commit 978398cbc4
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
m4/external.ncurses
View File

@ -34,27 +34,34 @@ if test "x$tr_NCURSES" = xyes; then
if test -n "$NCURSES_CONFIG"; then if test -n "$NCURSES_CONFIG"; then
NCURSES_LIBS="`$NCURSES_CONFIG --libs`" NCURSES_LIBS="`$NCURSES_CONFIG --libs`"
NCURSES_CPPFLAGS="`$NCURSES_CONFIG --cflags`" NCURSES_CPPFLAGS="`$NCURSES_CONFIG --cflags`"
TR_ABSOLUTE_LIBRARIES([ncurses], [NCURSES_LIBS])
if test "x$tr_libraries_found" != xyes; then
AC_MSG_ERROR([Please install the ncurses library])
fi
TRI_NCURSES_VERSION="`$NCURSES_CONFIG --version`"
else else
AC_MSG_WARN([Please install the ncurses library]) AC_CHECK_HEADERS(curses.h, [tr_NCURSES="yes"], [tr_NCURSES="no"])
tr_NCURSES="no"
if test "x$tr_NCURSES" = xyes; then
TR_FIND_C_LIBRARY([ncurses], [ncurses], [NCURSES_LIBS], [setupterm])
tr_NCURSES=$tr_library_found
fi
TRI_NCURSES_VERSION="ncurses"
fi fi
fi fi
if test "x$tr_NCURSES" = xyes; then if test "x$tr_NCURSES" != xyes; then
TR_ABSOLUTE_LIBRARIES([ncurses], [NCURSES_LIBS]) AC_MSG_ERROR([Please install the ncurses library])
if test "x$tr_libraries_found" != xyes; then
AC_MSG_ERROR([Please install the ncurses library])
fi
fi fi
if test "x$tr_NCURSES" = xyes; then AC_MSG_CHECKING([NCURSES version])
AC_MSG_CHECKING([NCURSES version]) AC_MSG_RESULT([$TRI_NCURSES_VERSION])
TRI_NCURSES_VERSION="`$NCURSES_CONFIG --version`" CPPFLAGS="$CPPFLAGS -DHAVE_NCURSES=1"
AC_MSG_RESULT([$TRI_NCURSES_VERSION]) NCURSES_CPPFLAGS="${NCURSES_CPPFLAGS} -DTRI_NCURSES_VERSION='\"${TRI_NCURSES_VERSION}\"'"
CPPFLAGS="$CPPFLAGS -DHAVE_NCURSES=1"
NCURSES_CPPFLAGS="${NCURSES_CPPFLAGS} -DTRI_NCURSES_VERSION='\"${TRI_NCURSES_VERSION}\"'"
fi
dnl ----------------------------------------------------------------------------------------- dnl -----------------------------------------------------------------------------------------
dnl fix include and static libraries dnl fix include and static libraries

1
m4/external.v8
View File

@ -72,6 +72,7 @@ dnl grep libev version number
dnl ----------------------------------------------------------------------------------------- dnl -----------------------------------------------------------------------------------------
if test "$cross_compiling" = yes; then : if test "$cross_compiling" = yes; then :
TRI_V8_VERSION="V8"
AC_MSG_WARN([cannot compute V8 version number when cross compiling]) AC_MSG_WARN([cannot compute V8 version number when cross compiling])
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext