From e92b45ebe2a6e6ee1e09314916b83e28157fb971 Mon Sep 17 00:00:00 2001
From: clayton craft <clayton@craftyguy.net>
Date: Mon, 21 Sep 2020 00:03:01 +0000
Subject: [PATCH] use system libs for libomemo and axc
---
src/lurch.c | 12 ++++++------
src/lurch_api.c | 6 +++---
src/lurch_cmd_ui.c | 2 +-
src/lurch_util.c | 2 +-
src/lurch_util.h | 4 ++--
test/test_lurch_api.c | 4 ++--
test/test_lurch_util.c | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/lurch.c
index 5102ce76..760de0e3 100644
--- a/src/lurch.c
+++ b/src/lurch.c
@@ -11,15 +11,15 @@
#include "jutil.h"
#include "pep.h"
-#include "libomemo.h"
-#include "libomemo_crypto.h"
-#include "libomemo_storage.h"
+#include <libomemo/libomemo.h>
+#include <libomemo/libomemo_crypto.h>
+#include <libomemo/libomemo_storage.h>
-#include "axc.h"
-#include "axc_store.h"
+#include <axc/axc.h>
+#include <axc/axc_store.h>
// included for error codes
-#include "signal_protocol.h"
+#include <signal_protocol.h>
#include "lurch.h"
#include "lurch_api.h"
diff --git a/src/lurch_api.c
index 202b34b8..b1526605 100644
--- a/src/lurch_api.c
+++ b/src/lurch_api.c
@@ -5,9 +5,9 @@
#include "chat.h"
#include "pep.h"
-#include "axc.h"
-#include "libomemo.h"
-#include "libomemo_storage.h"
+#include <axc/axc.h>
+#include <libomemo/libomemo.h>
+#include <libomemo/libomemo_storage.h>
#include "lurch_api.h"
#include "lurch_util.h"
diff --git a/src/lurch_cmd_ui.c
index a80d1823..4803acc2 100644
--- a/src/lurch_cmd_ui.c
+++ b/src/lurch_cmd_ui.c
@@ -5,7 +5,7 @@
#include "jutil.h"
-#include "libomemo.h"
+#include <libomemo/libomemo.h>
#include "lurch_api.h"
static void lurch_cmd_print(PurpleConversation * conv_p, const char * msg) {
diff --git a/src/lurch_util.c
index 63a6b407..fa4c15c4 100644
--- a/src/lurch_util.c
+++ b/src/lurch_util.c
@@ -1,7 +1,7 @@
#include <string.h>
#include <purple.h>
-#include "axc.h"
+#include <axc/axc.h>
#include "lurch_util.h"
diff --git a/src/lurch_util.h
index 259ab8a2..ff0f986d 100644
--- a/src/lurch_util.h
+++ b/src/lurch_util.h
@@ -1,6 +1,6 @@
#pragma once
-#include "axc.h"
+#include <axc/axc.h>
#define LURCH_PREF_ROOT "/plugins/core/lurch"
#define LURCH_PREF_AXC_LOGGING LURCH_PREF_ROOT "/axc_logging"
@@ -47,4 +47,4 @@ char * lurch_util_uname_get_db_fn(const char * uname, const char * which);
* @param key_buf_p The buffer containing the public key data.
* @return A newly allocated string which contains the fingerprint in printable format, or NULL. g_free() when done.
*/
-char * lurch_util_fp_get_printable(axc_buf * key_buf_p);
\ No newline at end of file
+char * lurch_util_fp_get_printable(axc_buf * key_buf_p);
diff --git a/test/test_lurch_api.c
index 8ce6f3a4..1070cd7b 100644
--- a/test/test_lurch_api.c
+++ b/test/test_lurch_api.c
@@ -7,8 +7,8 @@
#include "jabber.h"
#include "chat.h"
-#include "axc.h"
-#include "libomemo.h"
+#include <axc/axc.h>
+#include <libomemo/libomemo.h>
#include "../src/lurch_api.h"
diff --git a/test/test_lurch_util.c
index 5a4d7c9f..5236bf96 100644
--- a/test/test_lurch_util.c
+++ b/test/test_lurch_util.c
@@ -4,7 +4,7 @@
#include <cmocka.h>
#include <glib.h>
-#include "axc.h"
+#include <axc/axc.h>
#include "../src/lurch.h"
#include "../src/lurch_util.h"
@@ -213,4 +213,4 @@ int main(void) {
};
return cmocka_run_group_tests_name("lurch_util", tests, NULL, NULL);
-}
\ No newline at end of file
+}
--
2.28.0