Kaydet (Commit) 446f17f6 authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Michael Stahl

Automating configure choices based on what is installed considered harmful

Don't automatically --disable-odk (if not mentioned explicitly either
way) based on whether doxygen is found or not.

Caolán says: It's an absolute pain as a maintainer when packages do
that. You build it in some minimal build env and all is well, then
some depend changes and something else ends up in the build env and
now your package fails to build anymore, or behaves quite differently.

Change-Id: I8bc6ab6f90e6e070a37e37b5108081425e116173
Reviewed-on: https://gerrit.libreoffice.org/19324Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst d00d5f6f
......@@ -7335,11 +7335,7 @@ else
if test "$with_doxygen" = yes; then
AC_PATH_PROG([DOXYGEN], [doxygen])
if test -z "$DOXYGEN"; then
if test "$enable_odk" = "" ; then
enable_odk="no"
else
AC_MSG_ERROR([doxygen not found in \$PATH; specify its pathname via --with-doxygen=..., or disable its use via --without-doxygen])
fi
AC_MSG_ERROR([doxygen not found in \$PATH; specify its pathname via --with-doxygen=..., or disable its use via --without-doxygen])
fi
else
AC_MSG_CHECKING([for doxygen])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment