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 xep-0184

Browse Source
This commit is contained in:
James Booth 2015-03-15 15:31:59 +00:00
commit 48e06c5a68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -149,7 +149,7 @@ AS_IF([test "x$PLATFORM" != xosx],
AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"]) AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"])
### Check for desktop notification support ### Check for desktop notification support
### Linux requires libnotify ### Linux/FreeBSD require libnotify
### Windows uses native OS calls ### Windows uses native OS calls
### OSX requires terminal-notifier ### OSX requires terminal-notifier
@ -162,7 +162,7 @@ AS_IF([test "x$PLATFORM" = xosx],
[AC_MSG_ERROR([terminal-notifier not found, required for desktop notifications.])], [AC_MSG_ERROR([terminal-notifier not found, required for desktop notifications.])],
[AC_MSG_NOTICE([Desktop notifications not supported.])])], [AC_MSG_NOTICE([Desktop notifications not supported.])])],
[AC_DEFINE([HAVE_OSXNOTIFY], [1], [terminal notifier])])])], [AC_DEFINE([HAVE_OSXNOTIFY], [1], [terminal notifier])])])],
[test "x$PLATFORM" = xnix], [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd],
[AS_IF([test "x$enable_notifications" != xno], [AS_IF([test "x$enable_notifications" != xno],
[PKG_CHECK_MODULES([libnotify], [libnotify], [PKG_CHECK_MODULES([libnotify], [libnotify],
[AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])], [AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])],