Skip to content

Commit 1c7dc23

Browse files
sunshinecogitster
authored andcommitted
lib-httpd: extend module location auto-detection
Although it is possible to manually set LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH to point at the location of `httpd` and its modules, doing so is cumbersome and easily forgotten. To address this, 0d34473 (t/lib-http.sh: Restructure finding of default httpd location, 2010-01-02) enhanced lib-httpd.sh to automatically detect the location of `httpd` and its modules in order to facilitate out-of-the- box testing on a wider range of platforms. Follow that lead by further enhancing it to automatically detect the `httpd` modules on Void Linux, as well. Signed-off-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 83d5e33 commit 1c7dc23

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/lib-httpd.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ done
6565
for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \
6666
'/usr/lib/apache2/modules' \
6767
'/usr/lib64/httpd/modules' \
68-
'/usr/lib/httpd/modules'
68+
'/usr/lib/httpd/modules' \
69+
'/usr/libexec/httpd'
6970
do
7071
if test -d "$DEFAULT_HTTPD_MODULE_PATH"
7172
then

0 commit comments

Comments
 (0)