diff options
| author | James Booth <boothj5@gmail.com> | 2016-05-22 23:01:59 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2016-05-22 23:01:59 +0100 |
| commit | cd15a271533df18d0ae54bf7a40f80b08e13b7af (patch) | |
| tree | 786a9b5e4ef081822079af8ce38adda8310be2cd | |
| parent | eaf2901b0138c5ac9beb3c3619246eef577b2b31 (diff) | |
| parent | 0ad378642f57532c1870f542aaf35f361c80eefa (diff) | |
| download | profani-tty-cd15a271533df18d0ae54bf7a40f80b08e13b7af.tar.gz | |
Merge branch 'master' into cmd-tidy
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 7cc51f2b..8d06ecfe 100644 --- a/configure.ac +++ b/configure.ac @@ -139,7 +139,6 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw], [AC_MSG_ERROR([ncurses is required for profanity])])])])]) AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS" LIBS="$NCURSES_LIBS $LIBS" -AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lncurses $LIBS"]) ### Check wide characters support in ncurses library CFLAGS_RESTORE="$CFLAGS" @@ -164,7 +163,8 @@ AS_IF([test "x$ncurses_cv_wget_wch" != xyes], PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [], [AC_MSG_ERROR([glib 2.26 or higher is required for profanity])]) PKG_CHECK_MODULES([curl], [libcurl], [], - [AC_MSG_ERROR([libcurl is required for profanity])]) + [AC_CHECK_LIB([curl], [main], [], + [AC_MSG_ERROR([libcurl is required for profanity])])]) AS_IF([test "x$enable_icons" != xno], [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], @@ -183,8 +183,6 @@ AS_IF([test "x$PLATFORM" != xosx], AC_SUBST(AM_LDFLAGS)], [AC_MSG_ERROR([libreadline is required for profanity])])]) -AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"]) - ### Check for desktop notification support ### Linux/FreeBSD require libnotify ### Windows uses native OS calls |