diff --git a/config/Makefile.depend b/config/Makefile.depend index 3fdd2df32779da8451abab461bd379d9e4e05503..108746e4da7c273b7f14b357a2c220ecebc16b5c 100644 --- a/config/Makefile.depend +++ b/config/Makefile.depend @@ -144,9 +144,9 @@ MEMSTATGUILIBDEPM = $(MEMSTATLIB) $(TREELIB) $(GUILIB) RECLIBDEPM = $(IOLIB) $(TREELIB) $(GUILIB) $(THREADLIB) FITSIOLIBDEPM = $(HISTLIB) $(GPADLIB) $(GRAFLIB) $(MATRIXLIB) RLIBDEPM = $(MATRIXLIB) $(GUILIB) $(THREADLIB) -HTTPLIBDEPM = $(THREADLIB) $(HISTLIB) $(GPADLIB) $(GRAFLIB) $(IOLIB) -HTTPSNIFFLIBDEPM = $(HTTPLIB) $(THREADLIB) $(TREELIB) $(HISTLIB) $(GPADLIB) \ - $(GRAFLIB) $(IOLIB) $(XMLLIB) +HTTPLIBDEPM = $(THREADLIB) $(IOLIB) +HTTPSNIFFLIBDEPM = $(THREADLIB) $(TREELIB) $(HISTLIB) $(GPADLIB) \ + $(GRAFLIB) $(IOLIB) $(XMLLIB) $(HTTPLIB) ifeq ($(EXPLICITLINK),yes) @@ -439,14 +439,13 @@ RECLIBEXTRA = lib/libGui.lib lib/libRIO.lib lib/libTree.lib \ lib/libThread.lib FITSIOLIBEXTRA = lib/libHist.lib lib/libGpad.lib lib/libGraf.lib \ lib/libMatrix.lib -HTTPLIBEXTRA = lib/libThread.lib lib/libHist.lib \ - lib/libGpad.lib lib/libGraf.lib lib/libRIO.lib +HTTPLIBEXTRA = lib/libThread.lib lib/libRIO.lib ifeq ($(USEFASCGI), yes) HTTPLIBEXTRA += libfcgi endif HTTPSNIFFLIBEXTRA = lib/libThread.lib lib/libTree.lib lib/libHist.lib \ lib/libGpad.lib lib/libGraf.lib lib/libRIO.lib \ - lib/libXMLIO.lib + lib/libXMLIO.lib lib/libRHTTP.lib else @@ -578,11 +577,11 @@ MEMSTATGUILIBEXTRA = -Llib -lMemStat -lTree -lGui RECLIBEXTRA = -Llib -lGui -lRIO -lTree -lThread FITSIOLIBEXTRA = -Llib -lHist -lGpad -lGraf -lMatrix RLIBEXTRA = -Llib -lCore -lMatrix -lGui -lreadline -lThread -HTTPLIBEXTRA = -Llib -lThread -lHist -lGpad -lGraf -lRIO +HTTPLIBEXTRA = -Llib -lThread -lRIO ifeq ($(USEFASCGI), yes) HTTPLIBEXTRA += -lfcgi endif -HTTPSNIFFLIBEXTRA = -Llib -lThread -lTree -lHist -lGpad -lGraf -lRIO -lXMLIO +HTTPSNIFFLIBEXTRA = -Llib -lThread -lTree -lHist -lGpad -lGraf -lRIO -lXMLIO -lRHTTP endif diff --git a/net/http/CMakeLists.txt b/net/http/CMakeLists.txt index d112e47eab2d7a484b80e4ab46c13b77396b255b..ba1d7f4e4959b3a95788124f81402603bc0c846b 100644 --- a/net/http/CMakeLists.txt +++ b/net/http/CMakeLists.txt @@ -57,4 +57,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RHTTP SOURCES ${sources} LIBRARIES ${SYSLIBS} ZLIB::ZLIB ${RT_LIBRARIES} ${FASTCGI_LIBRARY} ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} - DEPENDENCIES Thread Hist Gpad Graf RIO) + DEPENDENCIES Thread RIO) diff --git a/net/http/src/THttpServer.cxx b/net/http/src/THttpServer.cxx index 4fe7f9e382b3eea58d4b60c25b9580dcd1163a54..2e2c5981202c808aac8745349d1134dbee95f4d9 100644 --- a/net/http/src/THttpServer.cxx +++ b/net/http/src/THttpServer.cxx @@ -168,7 +168,7 @@ THttpServer::THttpServer(const char *engine) fDrawPage = fJSROOTSYS + "/files/draw.htm"; TRootSnifferBase *sniff = nullptr; - if (strstr(engine,"nofullsniff")) { + if (strstr(engine,"nofullsniffer")) { sniff = new TRootSnifferBase("sniff"); } else { sniff = (TRootSnifferBase *) gROOT->ProcessLineSync("new TRootSniffer(\"sniff\");");