19 Dec
2012
19 Dec
'12
2:09 a.m.
Should be good as a first step. There shouldn't be -Wall.
The next step would be to check for ssl (similar to tls).
If you want, I can push a fix later on, or you can experiment :)
-ovidiu
On Tue, Dec 18, 2012 at 4:14 PM, Olle E. Johansson <oej(a)edvina.net> wrote:
Hi!
auth_identity in dev trunk did not compile on my FreeBSD server. By copying this code
from the utils/Makefile it did.
I don't know who manages auth_identity - but please throw an eye on this and tell me
if it's ok to commit?
Now I need to look into why the websocket module doesn't compile either. Something
with ssl.
Gotta be a solution in some Makefile somewhere.
/O
index f4974b0..3b47648 100644
--- a/modules/auth_identity/Makefile
+++ b/modules/auth_identity/Makefile
@@ -4,11 +4,24 @@ include ../../Makefile.defs
auto_gen=
NAME=auth_identity.so
+ifeq ($(CROSS_COMPILE),)
+CURL2CFG=$(shell which curl-config)
+endif
+
+ifneq ($(CURL2CFG),)
+ DEFS += $(shell $(CURL2CFG) --cflags )
+ LIBS += $(shell $(CURL2CFG) --libs)
+else
+ DEFS+=-I$(LOCALBASE)/include
+ LIBS+=-L$(LOCALBASE)/lib -lcurl
+endif
+
+
DEFS+= -Wall -I$(LOCALBASE)/ssl/include
#
# Dynamic linking
#
-LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto -lcurl
+LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto
#
# Static linking, if you'd like to use TLS and AUTH_IDENTITY at the same time