This website works better with JavaScript.
Home
Help
Register
Sign In
darthmama
/
pEpEngine
forked from
pEp.foundation/pEpEngine
Watch
1
Star
0
Fork
0
Code
Issues
0
Pull Requests
0
Projects
0
Releases
312
Wiki
Activity
Browse Source
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.
import_key_2.1
Krista 'DarthMama' Bennett
2 years ago
parent
a7bc9997c2
commit
a4581fcc6f
2 changed files
with
12 additions
and
1 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+11
-0
Makefile.conf
+1
-1
src/pEpEngine.h
+ 11
- 0
Makefile.conf
View File
@ -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.
i
f
e
q
(
$(
OPENPGP
)
,
S
E
Q
U
O
I
A
)
i
f
e
q
(
$(
SEQUOIA_CFLAGS
)
,
)
SEQUOIA_CFLAGS
=
$(
shell pkg-config --cflags-only-other sequoia-openpgp
)
e
n
d
i
f
i
f
e
q
(
$(
SEQUOIA_LDFLAGS
)
,
)
SEQUOIA_LDFLAGS
=
$(
shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp
)
e
n
d
i
f
i
f
e
q
(
$(
SEQUOIA_LIB
)
,
)
SEQUOIA_LIB
=
$(
shell pkg-config --libs-only-L sequoia-openpgp
)
e
n
d
i
f
i
f
e
q
(
$(
SEQUOIA_INC
)
,
)
SEQUOIA_INC
=
$(
shell pkg-config --cflags-only-I sequoia-openpgp
)
e
n
d
i
f
CFLAGS
+=
$(
SEQUOIA_CFLAGS
)
LD_FLAGS
+=
$(
SEQUOIA_LDFLAGS
)
e
n
d
i
f
+ 1
- 1
src/pEpEngine.h
View File
@ -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"
Write
Preview
Loading…
Cancel
Save