aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-29 19:56:07 -04:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2014-03-09 00:13:41 +00:00
commit 2731ef9cd8
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

@ -193,21 +193,22 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw],
[AC_MSG_ERROR([ncurses is required for profanity])])])])])
AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS"
LIBS="$LIBS $NCURSES_LIBS"
AS_IF([test "x$PLATFORM" = xosx], [LIBS="$LIBS -lncurses"])
### Check wide characters support in ncurses library
CFLAGS_RESTORE="$CFLAGS"
CFLAGS="$CFLAGS $NCURSES_CFLAGS"
AC_CACHE_CHECK([for wget_wch support in $NCURSES], ncurses_cv_wget_wch,
[AC_LINK_IFELSE([AC_LANG_SOURCE([
#include <ncurses.h>
int main() {
(void)wget_wch(NULL, NULL);
return 0;
}
])],
[ncurses_cv_wget_wch=yes],
[ncurses_cv_wget_wch=no])
])
[AC_LINK_IFELSE([AC_LANG_SOURCE([
#include <ncurses.h>
int main() {
(void)wget_wch(NULL, NULL);
return 0;
}
])],
[ncurses_cv_wget_wch=yes],
[ncurses_cv_wget_wch=no])
])
CFLAGS="$CFLAGS_RESTORE"
AS_IF([test "x$ncurses_cv_wget_wch" != xyes],
@ -218,6 +219,7 @@ 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])])
AS_IF([test "x$PLATFORM" = xosx], [LIBS="$LIBS -lcurl"])
### Check for desktop notification support
### Linux requires libnotify
@ -311,7 +313,7 @@ AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_CPPFLAGS)
### Checks for library functions.
AC_FUNC_MALLOC
AS_IF([test "x$PLATFORM" != xosx], [AC_FUNC_MALLOC])
AC_CHECK_FUNCS([atexit memset strdup strstr])
AC_CONFIG_FILES([Makefile])