From b648dafe05dd3ba3b830435db4af3e3ee3620609 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Wed, 29 Jan 2014 09:53:06 +0000 Subject: Close #1728: Removed milenage library from linking setting. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4720 74dad513-b988-da41-8d7b-12977e46ad98 --- build.mak.in | 8 +------- pjsip/include/pjsip/sip_config.h | 3 +++ third_party/build/Makefile | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.mak.in b/build.mak.in index 1db1dd61..a531228c 100644 --- a/build.mak.in +++ b/build.mak.in @@ -26,13 +26,7 @@ endif # Determine which party libraries to use export APP_THIRD_PARTY_EXT := export APP_THIRD_PARTY_LIBS := -export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) -ifeq ($(PJ_SHARED_LIBRARIES),) -APP_THIRD_PARTY_LIBS += -lmilenage-$(TARGET_NAME) -else -APP_THIRD_PARTY_LIBS += -lmilenage -APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libmilenage.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libmilenage.$(SHLIB_SUFFIX) -endif +export APP_THIRD_PARTY_LIB_FILES := ifeq (@ac_external_srtp@,1) # External SRTP library diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h index ed93e92e..95f75383 100644 --- a/pjsip/include/pjsip/sip_config.h +++ b/pjsip/include/pjsip/sip_config.h @@ -942,6 +942,9 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void) * Specify support for IMS/3GPP digest AKA authentication version 1 and 2 * (AKAv1-MD5 and AKAv2-MD5 respectively). * + * Note that if this is enabled, application would need to link with + * libmilenage library from \a third_party directory. + * * Default: 0 (for now) */ #ifndef PJSIP_HAS_DIGEST_AKA_AUTH diff --git a/third_party/build/Makefile b/third_party/build/Makefile index e1cb0da2..e0ac61bb 100644 --- a/third_party/build/Makefile +++ b/third_party/build/Makefile @@ -1,4 +1,4 @@ -DIRS = milenage +DIRS = include ../../build.mak include $(PJDIR)/build/common.mak -- cgit v1.2.3