Skip to content

Assume no configuration target as new default #2982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Assume no configuration target as new default #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ AC_SUBST(DOMJUDGE_VERSION, $PACKAGE_VERSION)
AC_DEFINE_UNQUOTED(DOMJUDGE_VERSION, "$PACKAGE_VERSION",
[DOMjudge version number (alias for PACKAGE_VERSION)])

AC_SUBST(DOMSERVER_BUILD_ENABLED,yes)
AC_SUBST(DOMSERVER_BUILD_ENABLED,no)
AC_ARG_ENABLE([domserver-build],AS_HELP_STRING([--enable-domserver-build],
[configure and build the domserver (default: yes).]),
[if test "x$enableval" = xno ; then AC_SUBST(DOMSERVER_BUILD_ENABLED,no) fi])

AC_SUBST(JUDGEHOST_BUILD_ENABLED,yes)
AC_SUBST(JUDGEHOST_BUILD_ENABLED,no)
AC_ARG_ENABLE([judgehost-build],AS_HELP_STRING([--enable-judgehost-build],
[configure and build the judgehost (default: yes).]),
[if test "x$enableval" = xno ; then AC_SUBST(JUDGEHOST_BUILD_ENABLED,no) fi])
Expand Down Expand Up @@ -389,6 +389,12 @@ if test "x$BASEURL_UNCONFIGURED" = x1 ; then
echo "Rerun configure with option '--with-baseurl=BASEURL' to correct this."
echo ""
fi
if test "x$JUDGEHOST_BUILD_ENABLED" = xno && test "x$DOMSERVER_BUILD_ENABLED" = xno ; then
echo "Warning: neither --enable-domserver-build nor --enable-judgehost-build provided."
echo "You probably want to rerun with either one (or both). This behaviour has changed"
echo "in DOMjudge 9.0."
echo ""
fi
fi # !QUIET
# }}}

Expand Down
2 changes: 1 addition & 1 deletion doc/manual/install-domserver.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ After installing the required software as described above, run configure.
In this example to install DOMjudge in the directory ``domjudge`` under
`/opt`::

./configure --prefix=/opt/domjudge
./configure --enable-domserver-build --prefix=/opt/domjudge
make domserver
sudo make install-domserver

Expand Down
2 changes: 1 addition & 1 deletion doc/manual/install-judgehost.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ for instructions to build from git sources.
After installing the software listed above, run configure. In this
example to install DOMjudge in the directory ``domjudge`` under `/opt`::

./configure --prefix=/opt/domjudge
./configure --enable-judgehost-build --prefix=/opt/domjudge
make judgehost
sudo make install-judgehost

Expand Down
4 changes: 2 additions & 2 deletions doc/manual/quick-install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DOMserver
* Make sure PHP works for the web server and command line scripts.

* Extract the `source tarball <https://www.domjudge.org/download>`_ and run
``./configure --with-baseurl=<url> && make domserver``.
``./configure --enable-domserver-build --with-baseurl=<url> && make domserver``.
* Run ``sudo make install-domserver`` to install the system.

* Install the MySQL database using e.g.
Expand Down Expand Up @@ -53,7 +53,7 @@ DOMserver
Judgehosts
----------
* Extract the `source tarball <https://www.domjudge.org/download>`_ and run
``./configure --with-baseurl=<url> && make judgehost``.
``./configure --enable-judgehost-build --with-baseurl=<url> && make judgehost``.
* Run ``sudo make install-judgehost`` to install the system.

* Create one or more unprivileged users:
Expand Down
Loading