Explorar o código

auth_identity: fix ssl cross-compilation

Ovidiu Sas %!s(int64=12) %!d(string=hai) anos
pai
achega
c9d8a66071
Modificáronse 1 ficheiros con 18 adicións e 4 borrados
  1. 18 4
      modules/auth_identity/Makefile

+ 18 - 4
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
+