On 1/26/24 15:57, Ruediger Pluem wrote:
There seem to be unrelated changes to mod_proxy_hcheck in the below. Is this
intended?
Well mod_proxy_hchech was missing... I was planning another commit.
Should I do 2 commits or just adjust the commit message?
Regards
Rüdiger
On 1/26/24 3:25 PM, jfcl...@apache.org wrote:
Author: jfclere
Date: Fri Jan 26 14:25:15 2024
New Revision: 1915411
URL: http://svn.apache.org/viewvc?rev=1915411&view=rev
Log:
ab needs an additional Ws2_32.lib (like abs)
Modified:
httpd/httpd/trunk/CMakeLists.txt
Modified: httpd/httpd/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1915411&r1=1915410&r2=1915411&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Fri Jan 26 14:25:15 2024
@@ -415,6 +415,7 @@ SET(MODULE_LIST
"modules/proxy/mod_proxy_fcgi+I+Apache proxy FastCGI module. Requires and is
enabled by --enable-proxy."
"modules/proxy/mod_proxy_ftp+I+Apache proxy FTP module. Requires and is enabled
by --enable-proxy."
"modules/proxy/mod_proxy_http+I+Apache proxy HTTP module. Requires and is
enabled by --enable-proxy."
+ "modules/proxy/mod_proxy_hcheck+I+Apache proxy Health check module. Requires and
is enabled by --enable-proxy."
"modules/proxy/mod_proxy_scgi+I+Apache proxy SCGI module. Requires and is
enabled by --enable-proxy."
"modules/proxy/mod_proxy_wstunnel+I+Apache proxy Websocket Tunnel module.
Requires and is enabled by --enable-proxy."
"modules/http2/mod_proxy_http2+i+Apache proxy HTTP/2 module. Requires
--enable-proxy."
@@ -549,6 +550,7 @@ SET(mod_proxy_express_extra_libs mod
SET(mod_proxy_fcgi_extra_libs mod_proxy)
SET(mod_proxy_ftp_extra_libs mod_proxy)
SET(mod_proxy_http_extra_libs mod_proxy)
+SET(mod_proxy_hcheck_extra_libs mod_proxy)
SET(mod_proxy_html_requires LIBXML2_FOUND)
IF(LIBXML2_FOUND)
SET(mod_proxy_html_extra_includes
"${LIBXML2_INCLUDE_DIR};${LIBXML2_ICONV_INCLUDE_DIR}")
@@ -935,7 +937,6 @@ SET_TARGET_PROPERTIES(httpd PROPERTIES
TARGET_LINK_LIBRARIES(httpd libhttpd ${EXTRA_LIBS})
SET(standard_support
- ab
htcacheclean
htdbm
htdigest
@@ -958,6 +959,15 @@ FOREACH(pgm ${standard_support})
TARGET_LINK_LIBRARIES(${pgm} ${EXTRA_LIBS} ${APR_LIBRARIES})
ENDFOREACH()
+ADD_EXECUTABLE(ab support/ab.c build/win32/httpd.rc)
+SET(install_targets ${install_targets} ab)
+SET(install_bin_pdb ${install_bin_pdb} $<TARGET_PDB_FILE:ab>)
+SET(tmp_includes ${HTTPD_INCLUDE_DIRECTORIES})
+SET_TARGET_PROPERTIES(ab PROPERTIES INCLUDE_DIRECTORIES "${tmp_includes}")
+DEFINE_WITH_BLANKS(define_long_name "LONG_NAME" "Apache HTTP Server ab
program")
+SET_TARGET_PROPERTIES(ab PROPERTIES COMPILE_FLAGS "-DAPP_FILE ${define_long_name}
-DBIN_NAME=ab.exe ${EXTRA_COMPILE_FLAGS}")
+TARGET_LINK_LIBRARIES(ab ${EXTRA_LIBS} ${APR_LIBRARIES} Ws2_32.lib)
+
IF(OPENSSL_FOUND)
ADD_EXECUTABLE(abs support/ab.c build/win32/httpd.rc)
SET(install_targets ${install_targets} abs)
@@ -969,7 +979,6 @@ IF(OPENSSL_FOUND)
SET_TARGET_PROPERTIES(abs PROPERTIES COMPILE_FLAGS "-DAPP_FILE
${define_long_name} -DBIN_NAME=abs.exe ${EXTRA_COMPILE_FLAGS}")
TARGET_LINK_LIBRARIES(abs ${EXTRA_LIBS} ${APR_LIBRARIES}
${OPENSSL_LIBRARIES} Ws2_32.lib)
ENDIF()
-GET_PROPERTY(tmp_includes TARGET ab PROPERTY INCLUDE_DIRECTORIES)
# Unit Test Suite
IF(CHECK_FOUND)
--
Cheers
Jean-Frederic
