# Required tools.
AC_PROG_CC
AC_PROG_CPP
+AC_PROG_CXX
AC_PROG_RANLIB
-AC_CHECK_TOOL(AR, ar, :)
-AC_CHECK_TOOLS(STRIP, strip)
-AC_CHECK_TOOLS(OBJCOPY, objcopy)
-AC_CHECK_TOOLS(DLLTOOL, dlltool)
-AC_CHECK_PROGS(MAKE, make)
-AC_CHECK_PROGS(UNZIP, unzip)
-AC_CHECK_PROGS(TAR, tar)
-AC_CHECK_PROGS(MKDIR, mkdir)
-AC_CHECK_PROGS(CP, cp)
-AC_CHECK_PROGS(RM, rm)
-AC_CHECK_PROGS(BISON, bison)
-AC_CHECK_PROGS(FLEX, flex)
-AC_CHECK_PROGS(PKG_CONFIG, pkg-config)
-AC_CHECK_PROGS(GPERF, gperf)
-AC_CHECK_PROGS(INTLTOOL_MERGE, intltool-merge)
-AC_CHECK_PROGS(STOW, stow)
-AC_CHECK_PROGS(MAKENSIS, makensis)
-AC_CHECK_PROGS(SHA256SUM, sha256sum)
-AC_CHECK_PROGS(MSGFMT, msgfmt)
-AC_CHECK_PROGS(BUILD_CC, gcc cc)
-AC_CHECK_PROGS(CMAKE, cmake)
-AC_CHECK_PROGS(MESON, meson)
-AC_CHECK_PROGS(NINJA, ninja)
-AC_CHECK_PROGS(RUBY, ruby)
AC_PROG_INSTALL
+CM_CHECK_REQ_TOOLS(AR, ar)
+CM_CHECK_REQ_TOOLS(LD, ld)
+CM_CHECK_REQ_TOOLS(STRIP, strip)
+CM_CHECK_REQ_TOOLS(OBJCOPY, objcopy)
+CM_CHECK_REQ_TOOLS(DLLTOOL, dlltool)
+CM_CHECK_REQ_TOOLS(WINDRES, windres)
+CM_CHECK_REQ_TOOLS(PKG_CONFIG, pkg-config)
+CM_CHECK_REQ_PROGS(MAKE, make)
+CM_CHECK_REQ_PROGS(UNZIP, unzip)
+CM_CHECK_REQ_PROGS(TAR, tar)
+CM_CHECK_REQ_PROGS(MKDIR, mkdir)
+CM_CHECK_REQ_PROGS(CP, cp)
+CM_CHECK_REQ_PROGS(RM, rm)
+CM_CHECK_REQ_PROGS(BISON, bison)
+CM_CHECK_REQ_PROGS(FLEX, flex)
+CM_CHECK_REQ_PROGS(GPERF, gperf)
+CM_CHECK_REQ_PROGS(INTLTOOL_MERGE, intltool-merge)
+CM_CHECK_REQ_PROGS(STOW, stow)
+CM_CHECK_REQ_PROGS(MAKENSIS, makensis)
+CM_CHECK_REQ_PROGS(SHA256SUM, sha256sum)
+CM_CHECK_REQ_PROGS(MSGFMT, msgfmt)
+CM_CHECK_REQ_PROGS(BUILD_CC, gcc cc)
+CM_CHECK_REQ_PROGS(CMAKE, cmake)
+CM_CHECK_REQ_PROGS(MESON, meson)
+CM_CHECK_REQ_PROGS(NINJA, ninja)
+CM_CHECK_REQ_PROGS(RUBY, ruby)
+CM_CHECK_REQ_PROGS(DOCBOOK2HTML, docbook2html)
+CM_CHECK_REQ_PROGS(DOCBOOK2TXT, docbook2txt)
+CM_CHECK_REQ_PROGS(DOCBOOK2PS, docbook2ps)
+CM_CHECK_REQ_PROGS(DOCBOOK2PDF, docbook2pdf)
+
+# Optional tools.
+AC_CHECK_PROGS(WGET, wget)
AC_MSG_CHECKING([for BASH])
AS_IF([test -n "$BASH_VERSION"],
AC_MSG_RESULT([$BASH_VERSION]),
AC_MSG_RESULT([no]); AC_MSG_ERROR([this configure script requires BASH]))
-missing_tools=
-for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM BISON FLEX PKG_CONFIG GPERF RUBY \
- INTLTOOL_MERGE STOW MAKENSIS SHA256SUM MSGFMT BUILD_CC CMAKE MESON NINJA; do
- eval tmp='$'$i
- if test -z "$tmp"; then
- missing_tools="$missing_tools `echo $i | tr 'A-Z' 'a-z'`"
- fi
-done
-
gcc_dir=$(dirname $($CC -print-libgcc-file-name))
AS_IF([test "$host" = "i686-w64-mingw32"],
AC_SUBST(host_cpu)
AC_SUBST(meson_cpu_family)
-# For the manual we need:
-AC_CHECK_PROGS(DOCBOOK2HTML, docbook2html)
-AC_CHECK_PROGS(DOCBOOK2TXT, docbook2txt)
-AC_CHECK_PROGS(DOCBOOK2PS, docbook2ps)
-AC_CHECK_PROGS(DOCBOOK2PDF, docbook2pdf)
-
-
-# Optional tools.
-
-AC_CHECK_PROGS(WGET, wget)
-
-
# Packages.
cm_dup_sources=""
CM_CHECK_DEPS
-# Throw an error if required tools are missing
-if test -n "$missing_tools"; then
- for i in $missing_tools; do
- AC_MSG_NOTICE([$i is missing])
- done
- AC_MSG_ERROR([[
-***
-*** Required tools not found. Please consult the above messages
-*** and install them before running configure again.
-***]])
-fi
-
# Throw an error if any duplicate source packages have been found
if test -n "$cm_dup_sources"; then
tmp=