diff --git a/autogen.sh b/autogen.sh index 2daf4fc5..e275b779 100755 --- a/autogen.sh +++ b/autogen.sh @@ -78,6 +78,13 @@ then echo ">> autoreconf" && \ autoreconf && exit 0 else + echo "" && \ + echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" && \ + echo "+ This script prepares the building environment for the configuration of musrfit. +" && \ + echo "+ During this process some informative messages might appear which can safely be +" && \ + echo "+ ignored as long as they are not tagged as errors. +" && \ + echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" && \ + echo "" && \ echo ">> libtoolize" && \ $LIBTOOLIZE --force && \ echo ">> aclocal" && \ diff --git a/configure.ac b/configure.ac index ef7ec0cb..2ccb5eaa 100644 --- a/configure.ac +++ b/configure.ac @@ -355,11 +355,19 @@ ROOT_CFLAGS="-I${ROOTINCDIR} ${ROOTCFLAGS} ${ROOTAUXCFLAGS}" # Check if Minuit2 has been enabled during the ROOT configuration AC_MSG_CHECKING([for Minuit2 in ROOT]) -if [[[ $(${ROOTCONF} --config) == *--enable-minuit2* ]]]; then +if test "x$(${ROOTCONF} --has-minuit2)" == "xyes"; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) - AC_MSG_ERROR([Minuit2 not included in the ROOT installation... Please configure ROOT with the --enable-minuit2 option!]) + AC_MSG_ERROR([Minuit2 is not included in the ROOT installation... Please configure ROOT with the --enable-minuit2 option!]) +fi + +AC_MSG_CHECKING([for MathMore in ROOT]) +if test "x$(${ROOTCONF} --has-mathmore)" == "xyes"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([MathMore is not included in the ROOT installation... Please configure ROOT with the --enable-mathmore option and check that the feature is actually built!]) fi AC_SUBST(ROOT_LIBS)