1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-16 21:35:24 +00:00

Merge branch 'master' into dev

This commit is contained in:
James Booth 2012-10-24 00:27:30 +01:00
commit b7ea72453f

View File

@ -17,14 +17,22 @@ 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])])
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
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([strophe], [main], [],
[AC_MSG_ERROR([libstrophe is required for profanity])])
AC_CHECK_LIB([ncurses], [main], [],
[AC_MSG_ERROR([ncurses is required for profanity])])
AC_CHECK_LIB([glib-2.0], [main], [],
[AC_MSG_ERROR([glib-2.0 is required for profanity])])
AC_CHECK_LIB([curl], [main], [],
@ -34,14 +42,6 @@ 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], [], [])