devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Added libotr back to configure by default

Browse Source 
Renamed to BUILD_OTR3
This commit is contained in:
James Booth
2014-02-08 23:07:51 +00:00
parent 3e02921859
commit 7e4b1b1dea
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@@ -131,17 +131,15 @@ elif test "x$with_xscreensaver" = x; then
[AC_MSG_NOTICE([libX11 not found, falling back to profanity auto-away])])
fi
AM_CONDITIONAL([BUILD_OTR], [true])
AM_CONDITIONAL([BUILD_OTR3], [false])
if test "x$enable_otr" = xyes; then
AC_CHECK_LIB([otr], [main], [],
AC_CHECK_LIB([otr], [main],
[AM_CONDITIONAL([BUILD_OTR3], [true])],
[AC_MSG_ERROR([libotr is required for otr encryption support])])
elif test "x$enable_otr" = xno; then
AM_CONDITIONAL([BUILD_OTR], [false])
elif test "x$enable_otr" = x; then
AM_CONDITIONAL([BUILD_OTR], [false])
### Add the following back in once libotr 4.0.0 support is enabled
### AC_CHECK_LIB([otr], [main], [],
### [AM_CONDITIONAL([BUILD_OTR], [false]) AC_MSG_NOTICE([libotr not found, otr entryption support not enabled])])
AC_CHECK_LIB([otr], [main],
[AM_CONDITIONAL([BUILD_OTR3], [true])],
[AC_MSG_NOTICE([libotr not found, otr entryption support not enabled])])
fi
### cmocka is required only for tests, profanity shouldn't be linked with it