[sr-dev] git:master: auth_identity: fix ssl cross-compilation

Module: sip-router Branch: master Commit: c9d8a66071efb77428ae74572d453c5b4ded4764 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9d8a66… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jan 11 14:12:10 2013 -0500 auth_identity: fix ssl cross-compilation --- modules/auth_identity/Makefile | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/auth_identity/Makefile b/modules/auth_identity/Makefile index 7ff53cf..052e5eb 100644 --- a/modules/auth_identity/Makefile +++ b/modules/auth_identity/Makefile @@ -10,6 +10,10 @@ CURL_BUILDER=$(shell \ else \ which curl-config; \ fi) +SSL_BUILDER=$(shell \ + if pkg-config --exists libssl; then \ + echo 'pkg-config libssl'; \ + fi) endif ifneq ($(CURL_BUILDER),) @@ -20,10 +24,19 @@ else LIBS+=-L$(LOCALBASE)/lib -lcurl endif -DEFS+= -Wall -I$(LOCALBASE)/ssl/include -# Dynamic linking -# -LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto +ifneq ($(SSL_BUILDER),) + DEFS += $(shell $(SSL_BUILDER) --cflags) + LIBS += $(shell $(SSL_BUILDER) --libs) +else + DEFS += -I$(LOCALBASE)/ssl/include + LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ + -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ + -lssl -lcrypto + # NOTE: depending on the way in which libssl was compiled you might + # have to add -lz -lkrb5 (zlib and kerberos5). + # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" +endif +LIBS+= $(TLS_EXTRA_LIBS) # Static linking, if you'd like to use TLS and AUTH_IDENTITY at the same time # @@ -32,3 +45,4 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto DEFS+=-DSER_MOD_INTERFACE include ../../Makefile.modules +