aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into dev

Browse Source
This commit is contained in:
James Booth 2012-10-23 23:30:16 +01:00
commit 1c2d99c007
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -11,6 +11,10 @@ AM_INIT_AUTOMAKE([foreign subdir-objects])
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC
# Options
AC_ARG_WITH([libxml2],
[AS_HELP_STRING([--with-libxml2], [link with libxml2 instead of expat])])
# Checks for libraries. # Checks for libraries.
AC_CHECK_LIB([ncurses], [main], [], AC_CHECK_LIB([ncurses], [main], [],
[AC_MSG_ERROR([ncurses is required for profanity])]) [AC_MSG_ERROR([ncurses is required for profanity])])
@ -18,8 +22,6 @@ AC_CHECK_LIB([resolv], [main], [],
[AC_MSG_ERROR([libresolv is required for profanity])]) [AC_MSG_ERROR([libresolv is required for profanity])])
AC_CHECK_LIB([ssl], [main], [], AC_CHECK_LIB([ssl], [main], [],
[AC_MSG_ERROR([openssl is required for profanity])]) [AC_MSG_ERROR([openssl is required for profanity])])
AC_CHECK_LIB([expat], [main], [],
[AC_MSG_ERROR([expat is required for profanity])])
AC_CHECK_LIB([strophe], [main], [], AC_CHECK_LIB([strophe], [main], [],
[AC_MSG_ERROR([libstrophe is required for profanity])]) [AC_MSG_ERROR([libstrophe is required for profanity])])
AC_CHECK_LIB([glib-2.0], [main], [], AC_CHECK_LIB([glib-2.0], [main], [],
@ -31,6 +33,14 @@ AC_CHECK_LIB([notify], [main], [],
AC_CHECK_LIB([headunit], [main], [], AC_CHECK_LIB([headunit], [main], [],
[AC_MSG_NOTICE([headunit not found, will not be able to run tests])]) [AC_MSG_NOTICE([headunit not found, will not be able to run tests])])
if test "x$with_libxml2" = xyes; then
AC_CHECK_LIB([xml2], [main], [],
[AC_MSG_ERROR([libxml2 is required for profanity])])
else
AC_CHECK_LIB([expat], [main], [],
[AC_MSG_ERROR([expat is required for profanity])])
fi
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS([stdlib.h string.h]) AC_CHECK_HEADERS([stdlib.h string.h])
AC_CHECK_HEADERS([ncurses.h], [], []) AC_CHECK_HEADERS([ncurses.h], [], [])
@ -41,8 +51,7 @@ PKG_CHECK_MODULES([NOTIFY], [libnotify], [],
[AC_MSG_NOTICE([libnotify module not found])]) [AC_MSG_NOTICE([libnotify module not found])])
AM_CFLAGS="-Wall " AM_CFLAGS="-Wall "
AM_CFLAGS="$AM_CFLAGS -lstrophe -lexpat -lncurses -lcurl -lresolv " LIBS="$LIBS $DEPS_LIBS $NOTIFY_LIBS"
AM_CFLAGS="$AM_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
AM_CPPFLAGS="$DEPS_CFLAGS $NOTIFY_CFLAGS" AM_CPPFLAGS="$DEPS_CFLAGS $NOTIFY_CFLAGS"

7
src/input_win.c
View File

@ -72,8 +72,11 @@ static void _parameter_autocomplete(char *input, int *size, char *command,
void void
create_input_window(void) create_input_window(void)
{ {
if (getenv("ESCDELAY") == NULL) #ifdef NCURSES_REENTRANT
ESCDELAY = 25; set_escdelay(25);
#else
ESCDELAY = 25;
#endif
int rows, cols; int rows, cols;
getmaxyx(stdscr, rows, cols); getmaxyx(stdscr, rows, cols);