GNUBoot/gnuboot
GNUBoot
/
gnuboot
mirror of https://git.savannah.gnu.org/git/gnuboot.git
2
1
Fork 0
Code Issues Releases Activity

configure.ac: Add --disable-lighttpd 

Users can also extract the tarball manually and point a browser to it,
so lighttpd should not be striclty required.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@a-lec.org>
This commit is contained in:
Denis 'GNUtoo' Carikli 2023-04-08 13:58:15 +02:00
parent 9cac692b41
commit 955ecb391f
Signed by: GNUtoo
GPG Key ID: 5F5DFCC14177E263
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -101,8 +101,16 @@ test: website.tar.gz
-- \ -- \
./serve.sh website.tar.gz ./serve.sh website.tar.gz
else else
if WANT_LIGHTTPD
test: website.tar.gz test: website.tar.gz
./serve.sh website.tar.gz ./serve.sh website.tar.gz
else
test:
@printf "%s %s\n" \
"The test target is disabled." \
"To enable it, run './configure --enable-lighttpd'."
@false
endif
endif endif
upload: website.tar.gz upload: website.tar.gz

21
configure.ac
View File

@ -51,6 +51,14 @@ AC_ARG_WITH([lbwww-img-path],
AM_CONDITIONAL( [WANT_LBWWW_IMG_PATH], [test x"$LBWWW_IMG_PATH" != x""]) AM_CONDITIONAL( [WANT_LBWWW_IMG_PATH], [test x"$LBWWW_IMG_PATH" != x""])
# --enable-lighttpd
AC_ARG_ENABLE(lighttpd,
[AS_HELP_STRING([--enable-lighttpd],
[Use lighttpd to run the scripts (default=enabled)])],
[lighttpd=$enableval],
[lighttpd="yes"])
AM_CONDITIONAL( [WANT_LIGHTTPD], [test x"$lighttpd" = x"yes"])
# --with-untitled-path # --with-untitled-path
AC_ARG_WITH([untitled-path], AC_ARG_WITH([untitled-path],
[AS_HELP_STRING([--with-untitled-path=PATH], [AS_HELP_STRING([--with-untitled-path=PATH],
@ -112,10 +120,15 @@ AS_IF([test x"$guix" = x"yes"],
[AC_MSG_ERROR( [AC_MSG_ERROR(
[gzip was not found in PATH ($PATH)])]) [gzip was not found in PATH ($PATH)])])
AC_CHECK_PROG([FOUND_LIGHTTPD], [lighttpd], [lighttpd]) AS_IF([test x"$lighttpd" = x"yes"],
AS_IF([test x"$FOUND_LIGHTTPD" = x""], [AC_CHECK_PROG([FOUND_LIGHTTPD], [lighttpd], [lighttpd])
[AC_MSG_ERROR( AS_IF([test x"$FOUND_LIGHTTPD" = x""],
[lighttpd was not found in PATH ($PATH)])]) [AC_MSG_ERROR(
[lighttpd was not found in PATH ($PATH)])])],
[AC_CHECK_PROG([FOUND_FALSE], [false], [false])
AS_IF([test x"$FOUND_FALSE" = x""],
[AC_MSG_ERROR(
[false was not found in PATH ($PATH)])])])
AC_CHECK_PROG([FOUND_MKDIR], [mkdir], [mkdir]) AC_CHECK_PROG([FOUND_MKDIR], [mkdir], [mkdir])
AS_IF([test x"$FOUND_MKDIR" = x""], AS_IF([test x"$FOUND_MKDIR" = x""],