diff options
| author | James Booth <boothj5@gmail.com> | 2014-02-08 23:07:51 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-02-08 23:07:51 +0000 |
| commit | 7e4b1b1dea89ff404bf9b75a380c064d78255239 (patch) | |
| tree | cfa9b4168bb13e101392f3d530229a15439a6068 | |
| parent | 3e02921859f13694113daa4264a7a3d02d9e250e (diff) | |
| download | profani-tty-7e4b1b1dea89ff404bf9b75a380c064d78255239.tar.gz | |
Added libotr back to configure by default
Renamed to BUILD_OTR3
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index a977ea7c..1c3388d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,7 +105,7 @@ with_git_sources = $(core_sources) tests_with_git_sources = $(test_sources) endif -if BUILD_OTR +if BUILD_OTR3 with_otr_sources = $(with_git_sources) $(otr_sources) tests_with_otr_sources = $(tests_with_git_sources) $(otr_sources) else diff --git a/configure.ac b/configure.ac index 3ffb8ccf..6661e40b 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |