mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-27 09:46:21 +00:00
Fixed OTR dependency when library not present, changed version to 0.4.2
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
# -*- Autoconf -*-
|
# -*- Autoconf -*-
|
||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_INIT([profanity], [0.5.0], [boothj5web@gmail.com])
|
AC_INIT([profanity], [0.4.2], [boothj5web@gmail.com])
|
||||||
AC_CONFIG_SRCDIR([src/main.c])
|
AC_CONFIG_SRCDIR([src/main.c])
|
||||||
AC_CONFIG_HEADERS([src/config.h])
|
AC_CONFIG_HEADERS([src/config.h])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
|
|||||||
@@ -41,7 +41,9 @@
|
|||||||
#include "jid.h"
|
#include "jid.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "muc.h"
|
#include "muc.h"
|
||||||
|
#ifdef HAVE_LIBOTR
|
||||||
#include "otr/otr.h"
|
#include "otr/otr.h"
|
||||||
|
#endif
|
||||||
#include "profanity.h"
|
#include "profanity.h"
|
||||||
#include "tools/autocomplete.h"
|
#include "tools/autocomplete.h"
|
||||||
#include "tools/parser.h"
|
#include "tools/parser.h"
|
||||||
|
|||||||
@@ -24,7 +24,9 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
#ifdef HAVE_LIBOTR
|
||||||
#include <libotr/proto.h>
|
#include <libotr/proto.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "chat_session.h"
|
#include "chat_session.h"
|
||||||
#include "command/commands.h"
|
#include "command/commands.h"
|
||||||
@@ -39,7 +41,9 @@
|
|||||||
#include "jid.h"
|
#include "jid.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "muc.h"
|
#include "muc.h"
|
||||||
|
#ifdef HAVE_LIBOTR
|
||||||
#include "otr/otr.h"
|
#include "otr/otr.h"
|
||||||
|
#endif
|
||||||
#include "profanity.h"
|
#include "profanity.h"
|
||||||
#include "tools/autocomplete.h"
|
#include "tools/autocomplete.h"
|
||||||
#include "tools/parser.h"
|
#include "tools/parser.h"
|
||||||
|
|||||||
@@ -48,7 +48,9 @@
|
|||||||
#include "jid.h"
|
#include "jid.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "muc.h"
|
#include "muc.h"
|
||||||
|
#ifdef HAVE_LIBOTR
|
||||||
#include "otr/otr.h"
|
#include "otr/otr.h"
|
||||||
|
#endif
|
||||||
#include "ui/ui.h"
|
#include "ui/ui.h"
|
||||||
#include "ui/titlebar.h"
|
#include "ui/titlebar.h"
|
||||||
#include "ui/statusbar.h"
|
#include "ui/statusbar.h"
|
||||||
|
|||||||
@@ -6,9 +6,12 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBOTR
|
||||||
#include "otr/otr.h"
|
#include "otr/otr.h"
|
||||||
|
#endif
|
||||||
#include "config/account.h"
|
#include "config/account.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBOTR
|
||||||
static void
|
static void
|
||||||
_mock_otr_keygen(ProfAccount *account)
|
_mock_otr_keygen(ProfAccount *account)
|
||||||
{
|
{
|
||||||
@@ -88,3 +91,4 @@ otr_start_query_returns(char *query)
|
|||||||
otr_start_query = _mock_otr_start_query;
|
otr_start_query = _mock_otr_start_query;
|
||||||
will_return(_mock_otr_start_query, query);
|
will_return(_mock_otr_start_query, query);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user