Skip to content

Commit a144674

Browse files
committed
Assume no configuration target as new default
We already allowed skipping certain checks for compilers etc. but only if someone is aware of the option. Changing this now for the next major release.
1 parent a59ab57 commit a144674

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

configure.ac

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ AC_SUBST(DOMJUDGE_VERSION, $PACKAGE_VERSION)
3131
AC_DEFINE_UNQUOTED(DOMJUDGE_VERSION, "$PACKAGE_VERSION",
3232
[DOMjudge version number (alias for PACKAGE_VERSION)])
3333

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

39-
AC_SUBST(JUDGEHOST_BUILD_ENABLED,yes)
39+
AC_SUBST(JUDGEHOST_BUILD_ENABLED,no)
4040
AC_ARG_ENABLE([judgehost-build],AS_HELP_STRING([--enable-judgehost-build],
4141
[configure and build the judgehost (default: yes).]),
4242
[if test "x$enableval" = xno ; then AC_SUBST(JUDGEHOST_BUILD_ENABLED,no) fi])
@@ -389,6 +389,12 @@ if test "x$BASEURL_UNCONFIGURED" = x1 ; then
389389
echo "Rerun configure with option '--with-baseurl=BASEURL' to correct this."
390390
echo ""
391391
fi
392+
if test "x$JUDGEHOST_BUILD_ENABLED" = xno && test "x$DOMSERVER_BUILD_ENABLED" = xno ; then
393+
echo "Warning: neither --enable-domserver-build nor --enable-judgehost-build provided."
394+
echo "You probably want to rerun with either one (or both). This behaviour has changed"
395+
echo "in DOMjudge 9.0."
396+
echo ""
397+
fi
392398
fi # !QUIET
393399
# }}}
394400

doc/manual/install-domserver.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ After installing the required software as described above, run configure.
6565
In this example to install DOMjudge in the directory ``domjudge`` under
6666
`/opt`::
6767

68-
./configure --prefix=/opt/domjudge
68+
./configure --enable-domserver-build --prefix=/opt/domjudge
6969
make domserver
7070
sudo make install-domserver
7171

doc/manual/install-judgehost.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ for instructions to build from git sources.
6464
After installing the software listed above, run configure. In this
6565
example to install DOMjudge in the directory ``domjudge`` under `/opt`::
6666

67-
./configure --prefix=/opt/domjudge
67+
./configure --enable-judgehost-build --prefix=/opt/domjudge
6868
make judgehost
6969
sudo make install-judgehost
7070

doc/manual/quick-install.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DOMserver
1515
* Make sure PHP works for the web server and command line scripts.
1616

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

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

5959
* Create one or more unprivileged users:

0 commit comments

Comments
 (0)