swig: search for swig4.0

* configure.ac: Use swig4.0 when available.
* HACKING: Update.
This commit is contained in:
Alexandre Duret-Lutz 2020-06-09 00:14:36 +02:00
parent 1a8920d9b6
commit da9d92eef7
2 changed files with 7 additions and 6 deletions

View file

@ -27,14 +27,14 @@ since the generated files they produce are distributed.)
GNU Flex (the version seems to matters, we used 2.5.35)
GNU Bison >= 3.0
GNU Emacs (preferably >= 24 but it may work with older versions)
Note that if you use Macports you should consider to install the
swig-python package in addition to the swig package.
org-mode >= 9.1 (the version that comes bundled with your emacs
version is likely out-of-date; but distribution often have
a separate and more recent org-mode package, or you can
simply upgrade from ELPA).
Groff (a.k.a. GNU troff) >= 1.20
SWIG >= 3.0 (for its better C++11/C++14 support)
SWIG >= 3.0.2 (for its better C++11/C++14 support)
Note that if you use Macports you should consider to install the
swig-python package in addition to the swig package.
Doxygen >= 1.4.0
R used by some examples in the documentation
Perl, with its Gettext module (it might be called something like

View file

@ -199,9 +199,10 @@ AC_CHECK_PROG([EMACS], [emacs], [emacs])
AC_CHECK_PROGS([IPYTHON], [ipython3 ipython], [ipython])
AC_CHECK_PROG([LBTT_TRANSLATE], [lbtt-translate], [lbtt-translate])
AX_CHECK_VALGRIND
# Debian has a binary for SWIG 3.0 named swig3.0 and they kept swig as
# an alias for swig-2.0. Let's use the former when available.
AC_CHECK_PROGS([SWIG], [swig3.0 swig], [swig])
# Debian used to reserve the name 'swig' for swig-2.0. So prefer
# swig4.0 (available in Debian bullseye) to swig3.0 (available in Debian buster)
# ti swig.
AC_CHECK_PROGS([SWIG], [swig4.0 swig3.0 swig], [swig])
AC_SUBST([CROSS_COMPILING], [$cross_compiling])