From a4581fcc6f485dbff83cdf4fce35bc04a3b26f6d Mon Sep 17 00:00:00 2001
From: Krista 'DarthMama' Bennett <krista@pep.foundation>
Date: Mon, 11 May 2020 10:35:17 +0200
Subject: [PATCH] Don't call pkg-config if the sequoia vars are already set in
 local.conf - we should probably refactor this so local.conf comes afterward
 anyway. I don't understand damiano's reasoning here.

---
 Makefile.conf   | 11 +++++++++++
 src/pEpEngine.h |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile.conf b/Makefile.conf
index ff5d1945a..ee27132f1 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -266,11 +266,22 @@ endif
 
 ######### Post processing assignments ########
 # These variables are ineffective when set anywhere else but here.
+# KB: I have no idea why we do this - it totally defeats the purpose of
+#     local.conf.
+#     For now: set if has no value.
 ifeq ($(OPENPGP),SEQUOIA)
+ifeq ($(SEQUOIA_CFLAGS),)
     SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia-openpgp)
+endif
+ifeq ($(SEQUOIA_LDFLAGS),)
     SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
+endif
+ifeq ($(SEQUOIA_LIB),)
     SEQUOIA_LIB=$(shell pkg-config --libs-only-L sequoia-openpgp)
+endif
+ifeq ($(SEQUOIA_INC),)
     SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)
+endif
     CFLAGS+= $(SEQUOIA_CFLAGS)
     LD_FLAGS+= $(SEQUOIA_LDFLAGS)
 endif
diff --git a/src/pEpEngine.h b/src/pEpEngine.h
index 806da0217..a9cabbfc1 100644
--- a/src/pEpEngine.h
+++ b/src/pEpEngine.h
@@ -27,7 +27,7 @@ extern "C" {
 #define PEP_ENGINE_VERSION_MAJOR 2
 #define PEP_ENGINE_VERSION_MINOR 1
 #define PEP_ENGINE_VERSION_PATCH 0
-#define PEP_ENGINE_VERSION_RC    0
+#define PEP_ENGINE_VERSION_RC    1
 
 
 #define PEP_OWN_USERID "pEp_own_userId"