http: adjust makefile for new civetweb version

Signed-off-by: Sergey Linev <S.Linev@gsi.de>
Signed-off-by: Bertrand Bellenot <bertrand.bellenot@cern.ch>

net/http/CMakeLists.txt

@@ -44,8 +44,14 @@ if(NOT FASTCGI_INCLUDE_DIR OR NOT FASTCGI_LIBRARY)
   add_definitions(-DHTTP_WITHOUT_FASTCGI)
 endif()
 
+add_definitions(-DUSE_WEBSOCKET)
+
+if(NOT MSVC)
+  set(RT_LIBRARY "-lrt")
+endif(MSVC)
+
 ROOT_GENERATE_DICTIONARY(G__RHTTP ${headers} MODULE RHTTP LINKDEF LinkDef.h)
-ROOT_LINKER_LIBRARY(RHTTP ${sources} G__RHTTP.cxx LIBRARIES ${SYSLIBS} ${ZLIB_LIBRARY} ${FASTCGI_LIBRARY} ${OPENSSL_LIBRARIES}  ${CMAKE_DL_LIBS} DEPENDENCIES Thread Tree Hist Gpad Graf RIO XMLIO)
+ROOT_LINKER_LIBRARY(RHTTP ${sources} G__RHTTP.cxx LIBRARIES ${SYSLIBS} ${ZLIB_LIBRARY} ${RT_LIBRARY} ${FASTCGI_LIBRARY} ${OPENSSL_LIBRARIES}  ${CMAKE_DL_LIBS} DEPENDENCIES Thread Tree Hist Gpad Graf RIO XMLIO)
 
 
 ROOT_INSTALL_HEADERS()

net/http/Module.mk

@@ -34,7 +34,7 @@ HTTPDEP      := $(HTTPO:.o=.d) $(HTTPDO:.o=.d)
 HTTPLIB      := $(LPATH)/libRHTTP.$(SOEXT)
 HTTPMAP      := $(HTTPLIB:.$(SOEXT)=.rootmap)
 
-HTTPCXXFLAGS := $(HTTPINCDIR:%=-I%) $(FASTCGIINCDIR:%=-I%) $(FASTCGIFLAGS)
+HTTPCXXFLAGS := $(HTTPINCDIR:%=-I%) $(FASTCGIINCDIR:%=-I%) $(FASTCGIFLAGS) -DUSE_WEBSOCKET
 
 # used in the main Makefile
 ALLHDRS     += $(patsubst $(MODDIRI)/%.h,include/%.h,$(HTTPH))
@@ -46,6 +46,11 @@ INCLUDEFILES += $(HTTPDEP)
 
 HTTPLIBEXTRA += $(ZLIBLIBDIR) $(ZLIBCLILIB)
 
+ifneq ($(PLATFORM),win32)
+HTTPLIBEXTRA += -lrt
+endif
+
+
 ##### local rules #####
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)