From d9f04a78bf8679afc0c656f3440beb73b2dc8744 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sun, 16 Nov 2014 19:50:08 +0100 Subject: enable bootstrapping by default The SciTECO language changes often and the build system scripts are adapted accordingly. If bootstrapping is disabled by default on systems that already have SciTECO, building recent Git versions will fail often due to macro errors. This is not easy to see and correct for users. Also the build-time overhead for `sciteco-minimal` is minimal. The --disable-bootstrap option is mostly useful when cross-compiling SciTECO. --- configure.ac | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8b67de1..db631dc 100644 --- a/configure.ac +++ b/configure.ac @@ -58,9 +58,6 @@ AC_SUBST(DOXYGEN_HAVE_DOT) # For bootstrapping via installed sciteco AC_CHECK_PROG(SCITECO, sciteco, sciteco) -if [[ x$SCITECO = x ]]; then - bootstrap=yes -fi # Checks for libraries. PKG_CHECK_MODULES(LIBGLIB, [glib-2.0], [ @@ -213,10 +210,14 @@ fi AM_CONDITIONAL(BUILD_DEVDOC, [test $dev_doc = yes]) AC_ARG_ENABLE(bootstrap, - AS_HELP_STRING([--enable-bootstrap], + AS_HELP_STRING([--disable-bootstrap], [Bootstrap using sciteco-minimal, - otherwise use preinstalled sciteco [default=check]]), - [bootstrap=$enableval]) + otherwise use preinstalled sciteco [default=yes]]), + [bootstrap=$enableval], [bootstrap=yes]) +if [[ $bootstrap = no -a x$SCITECO = x ]]; then + AC_MSG_ERROR([Disabled bootstrapping, but preinstalled SciTECO cannot be found! + Try --enable-bootstrap.]) +fi AM_CONDITIONAL(BOOTSTRAP, [test x$bootstrap = xyes]) AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile]) -- cgit v1.2.3