diff options
| author | James Booth <boothj5@gmail.com> | 2012-10-24 00:27:30 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2012-10-24 00:27:30 +0100 |
| commit | b7ea72453f5ac0b7560b8f0961f7a74998f67b71 (patch) | |
| tree | 990da9b42939b0e24069e94cd0b9b5c27abd4155 | |
| parent | f1d641b5e13c16d5c5bb1cea528efdf929f2b7d3 (diff) | |
| parent | 7d6e64a53a40da1896ebaa17ffbbbe6cd2d02786 (diff) | |
| download | profani-tty-b7ea72453f5ac0b7560b8f0961f7a74998f67b71.tar.gz | |
Merge branch 'master' into dev
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index b7bbc7e2..c0590d44 100644 --- a/configure.ac +++ b/configure.ac @@ -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], [], []) |