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

@@ -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

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"