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 osx-functional

Browse Source
This commit is contained in:
James Booth 2016-05-22 22:58:54 +01:00
commit 149bfbd2a0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -139,7 +139,6 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw],
[AC_MSG_ERROR([ncurses is required for profanity])])])])]) [AC_MSG_ERROR([ncurses is required for profanity])])])])])
AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS"
LIBS="$NCURSES_LIBS $LIBS" LIBS="$NCURSES_LIBS $LIBS"
AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lncurses $LIBS"])
### Check wide characters support in ncurses library ### Check wide characters support in ncurses library
CFLAGS_RESTORE="$CFLAGS" 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], [], PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [],
[AC_MSG_ERROR([glib 2.26 or higher is required for profanity])]) [AC_MSG_ERROR([glib 2.26 or higher is required for profanity])])
PKG_CHECK_MODULES([curl], [libcurl], [], 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], AS_IF([test "x$enable_icons" != xno],
[PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], [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_SUBST(AM_LDFLAGS)],
[AC_MSG_ERROR([libreadline is required for profanity])])]) [AC_MSG_ERROR([libreadline is required for profanity])])])
AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"])
### Check for desktop notification support ### Check for desktop notification support
### Linux/FreeBSD require libnotify ### Linux/FreeBSD require libnotify
### Windows uses native OS calls ### Windows uses native OS calls