* configure.ac: Prefer swig-3.0 when available.

This commit is contained in:
Alexandre Duret-Lutz 2014-10-28 23:53:04 +01:00
parent 946f7e80dd
commit bc9cb1e5bb
2 changed files with 4 additions and 3 deletions

1
NEWS
View file

@ -32,6 +32,7 @@ New in spot 1.2.5a (not yet released)
libstd++ has also been fixed. libstd++ has also been fixed.
- all parsers would report wrong line numbers while processing - all parsers would report wrong line numbers while processing
files with DOS style newlines. files with DOS style newlines.
- add support for SWIG 3.0.
New in spot 1.2.5 (2014-08-21) New in spot 1.2.5 (2014-08-21)

View file

@ -117,9 +117,9 @@ AC_CHECK_PROG([EMACS], [emacs], [emacs])
AC_CHECK_PROG([LBTT_TRANSLATE], [lbtt-translate], [lbtt-translate]) AC_CHECK_PROG([LBTT_TRANSLATE], [lbtt-translate], [lbtt-translate])
AX_CHECK_VALGRIND AX_CHECK_VALGRIND
AC_CHECK_PROG([WRING2LBTT], [wring2lbtt], [wring2lbtt]) AC_CHECK_PROG([WRING2LBTT], [wring2lbtt], [wring2lbtt])
# Debian has a binary for SWIG 2.0 named swig2.0 and they kept swig as # Debian has a binary for SWIG 3.0 named swig3.0 and they kept swig as
# an alias for swig-1.3. Let's use the former when available. # an alias for swig-2.0. Let's use the former when available.
AC_CHECK_PROGS([SWIG], [swig2.0 swig], [swig]) AC_CHECK_PROGS([SWIG], [swig3.0 swig], [swig])
AC_SUBST([CROSS_COMPILING], [$cross_compiling]) AC_SUBST([CROSS_COMPILING], [$cross_compiling])