diff options
| author | James Booth <boothj5@gmail.com> | 2012-10-23 23:30:16 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2012-10-23 23:30:16 +0100 |
| commit | 1c2d99c007092d9cc2a844a62c10af34f8dcaff9 (patch) | |
| tree | 84673ae646a1c8fd7e830cc0b606485ed5a53078 | |
| parent | f8a4d21ab394dcad5aa1778c68c31107ccfb70b0 (diff) | |
| parent | c2e94bfb20ad67a9f4986757a0672adf943e35f4 (diff) | |
| download | profani-tty-1c2d99c007092d9cc2a844a62c10af34f8dcaff9.tar.gz | |
Merge branch 'master' into dev
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | src/input_win.c | 7 |
2 files changed, 18 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index eeb704a0..9e4b18c6 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,10 @@ AM_INIT_AUTOMAKE([foreign subdir-objects]) # Checks for programs. AC_PROG_CC +# Options +AC_ARG_WITH([libxml2], + [AS_HELP_STRING([--with-libxml2], [link with libxml2 instead of expat])]) + # Checks for libraries. AC_CHECK_LIB([ncurses], [main], [], [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_CHECK_LIB([ssl], [main], [], [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_MSG_ERROR([libstrophe is required for profanity])]) AC_CHECK_LIB([glib-2.0], [main], [], @@ -31,6 +33,14 @@ AC_CHECK_LIB([notify], [main], [], AC_CHECK_LIB([headunit], [main], [], [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. AC_CHECK_HEADERS([stdlib.h string.h]) AC_CHECK_HEADERS([ncurses.h], [], []) @@ -41,8 +51,7 @@ PKG_CHECK_MODULES([NOTIFY], [libnotify], [], [AC_MSG_NOTICE([libnotify module not found])]) AM_CFLAGS="-Wall " -AM_CFLAGS="$AM_CFLAGS -lstrophe -lexpat -lncurses -lcurl -lresolv " -AM_CFLAGS="$AM_CFLAGS $DEPS_LIBS $NOTIFY_LIBS" +LIBS="$LIBS $DEPS_LIBS $NOTIFY_LIBS" AM_CPPFLAGS="$DEPS_CFLAGS $NOTIFY_CFLAGS" diff --git a/src/input_win.c b/src/input_win.c index 408bd45a..9ee71ce1 100644 --- a/src/input_win.c +++ b/src/input_win.c @@ -72,8 +72,11 @@ static void _parameter_autocomplete(char *input, int *size, char *command, void create_input_window(void) { - if (getenv("ESCDELAY") == NULL) - ESCDELAY = 25; +#ifdef NCURSES_REENTRANT + set_escdelay(25); +#else + ESCDELAY = 25; +#endif int rows, cols; getmaxyx(stdscr, rows, cols); |