Merge remote-tracking branch 'origin/kdf_openssl' into integration_2022_wk06
This commit is contained in:
@@ -14,14 +14,6 @@ DATE_REV := $(shell date '+%F %T')
|
||||
|
||||
NUM_CORES:=$(shell cat /proc/cpuinfo | grep processor | wc -l)
|
||||
|
||||
# Check for libraries and export cflags/linker variables
|
||||
NETTLE_FOUND := $(shell if pkg-config --exists nettle; then echo "1" ; else echo "0"; fi)
|
||||
ifeq ($(NETTLE_FOUND), 1)
|
||||
NETTLE_LIBS := $(shell pkg-config --libs nettle)
|
||||
#else
|
||||
#@echo "package nettle not installed"
|
||||
endif
|
||||
|
||||
OPENSSL_FOUND := $(shell if pkg-config --exists openssl; then echo "1" ; else echo "0"; fi)
|
||||
ifeq ($(OPENSSL_FOUND), 1)
|
||||
OPENSSL_LIBS := $(shell pkg-config --libs openssl)
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ First, you must have all four openair SW directories, openair1, openair2, openai
|
||||
- libpgm-5.1 and libpgm-5.1-dev for distributed simulation with reliable multicast transmport
|
||||
- libxml2 and libxml2-dev
|
||||
- libforms-bin libforms-dev
|
||||
- nettle-dev nettle-bin openssl libssl-dev
|
||||
- openssl libssl-dev
|
||||
- libatlas-base-dev and libatlas-headers (for Ubuntu 11.04, libatlas-dev instead of libatlas-headers)
|
||||
- asn1c and the LTE ASN1 files (for more information on how to install this and generate the required files see the README file in openair2/RRC/LITE/MESSAGES)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user