aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Check for libotr version

Browse Source
This commit is contained in:
James Booth 2014-02-09 00:32:11 +00:00
parent 50afe7366e
commit fa89e2aa62
3 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.am
View File

@ -94,8 +94,11 @@ main_source = src/main.c
git_sources = \ git_sources = \
src/gitversion.c src/gitversion.c
otr_sources = \ otr3_sources = \
src/otr.c src/otr.h src/otr3.c src/otr.h
otr4_sources = \
src/otr4.c src/otr.h
if INCLUDE_GIT_VERSION if INCLUDE_GIT_VERSION
with_git_sources = $(git_sources) $(core_sources) with_git_sources = $(git_sources) $(core_sources)
@ -105,9 +108,15 @@ with_git_sources = $(core_sources)
tests_with_git_sources = $(test_sources) tests_with_git_sources = $(test_sources)
endif endif
if BUILD_OTR
if BUILD_OTR3 if BUILD_OTR3
with_otr_sources = $(with_git_sources) $(otr_sources) with_otr_sources = $(with_git_sources) $(otr3_sources)
tests_with_otr_sources = $(tests_with_git_sources) $(otr_sources) tests_with_otr_sources = $(tests_with_git_sources) $(otr3_sources)
endif
if BUILD_OTR4
with_otr_sources = $(with_git_sources) $(otr4_sources)
tests_with_otr_sources = $(tests_with_git_sources) $(otr4_sources)
endif
else else
with_otr_sources = $(with_git_sources) with_otr_sources = $(with_git_sources)
tests_with_otr_sources = $(tests_with_git_sources) tests_with_otr_sources = $(tests_with_git_sources)

28
configure.ac
View File

@ -131,14 +131,38 @@ elif test "x$with_xscreensaver" = x; then
[AC_MSG_NOTICE([libX11 not found, falling back to profanity auto-away])]) [AC_MSG_NOTICE([libX11 not found, falling back to profanity auto-away])])
fi fi
AM_CONDITIONAL([BUILD_OTR], [false])
AM_CONDITIONAL([BUILD_OTR3], [false]) AM_CONDITIONAL([BUILD_OTR3], [false])
AM_CONDITIONAL([BUILD_OTR4], [false])
if test "x$enable_otr" = xyes; then if test "x$enable_otr" = xyes; then
AC_SEARCH_LIBS([otrl_init], [otr], AC_SEARCH_LIBS([otrl_init], [otr],
[AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])], [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_ERROR([libotr is required for otr encryption support])]) [AC_MSG_ERROR([libotr is required for otr encryption support])])
elif test "x$enable_otr" = x; then elif test "x$enable_otr" = x; then
AC_SEARCH_LIBS([otrl_init], [otr], AC_SEARCH_LIBS([otrl_init], [otr],
[AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])], [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 entryption support not enabled])]) [AC_MSG_NOTICE([libotr not found, otr entryption support not enabled])])
fi fi

2
src/otr.c → src/otr3.c
View File

@ -1,5 +1,5 @@
/* /*
* otr.c * otr3.c
* *
* Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com> * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
* *