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 remote-tracking branch 'pasis/configure-cleanup'

Browse Source
This commit is contained in:
James Booth 2015-06-21 23:32:03 +01:00
commit 2c8b598d3f
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@ -202,7 +202,7 @@ fi
AM_CONDITIONAL([BUILD_OTR], [false])
AM_CONDITIONAL([BUILD_OTR3], [false])
AM_CONDITIONAL([BUILD_OTR4], [false])
if test "x$enable_otr" = xyes; then
if test "x$enable_otr" != xno; then
AC_SEARCH_LIBS([otrl_init], [otr],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[
@ -216,22 +216,9 @@ if test "x$enable_otr" = xyes; then
]])],
[AM_CONDITIONAL([BUILD_OTR], [true]) AM_CONDITIONAL([BUILD_OTR4], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])],
[AM_CONDITIONAL([BUILD_OTR], [true]) AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])])],
[AC_MSG_ERROR([libotr is required for otr encryption support])])
elif test "x$enable_otr" = x; then
AC_SEARCH_LIBS([otrl_init], [otr],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[
#include <libotr/version.h>
]],[[
#if OTRL_VERSION_MAJOR == 4
// OK
#else
# assume version 3
#endif
]])],
[AM_CONDITIONAL([BUILD_OTR], [true]) AM_CONDITIONAL([BUILD_OTR4], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])],
[AM_CONDITIONAL([BUILD_OTR], [true]) AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])])],
[AC_MSG_NOTICE([libotr not found, otr encryption support not enabled])])
[AS_IF([test "x$enable_otr" = xyes],
[AC_MSG_ERROR([libotr is required for otr encryption support])],
[AC_MSG_NOTICE([libotr not found, otr encryption support not enabled])])])
fi
AS_IF([test "x$with_themes" = xno],