[Debian-astro-commits] [gyoto] 196/221: configure: look for swig3.0 as alternative for SWIG

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 5ea26ab877df2421529b5a571c4eb06fa1a99d48
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Thu Jan 15 11:47:20 2015 +0100

    configure: look for swig3.0 as alternative for SWIG
---
 configure         | 3 ++-
 m4/ax_pkg_swig.m4 | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index f30c4cc..698e5f3 100755
--- a/configure
+++ b/configure
@@ -16203,7 +16203,8 @@ fi
 
 
         # Ubuntu has swig 2.0 as /usr/bin/swig2.0
-        for ac_prog in swig swig2.0
+        # Debian has swig 3.0 as /usr/bin/swig3.0
+        for ac_prog in swig swig2.0 swig3.0
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/m4/ax_pkg_swig.m4 b/m4/ax_pkg_swig.m4
index d836eec..a5d71de 100644
--- a/m4/ax_pkg_swig.m4
+++ b/m4/ax_pkg_swig.m4
@@ -36,6 +36,7 @@
 #   Copyright (c) 2008 Rafael Laboissiere <rafael at laboissiere.net>
 #   Copyright (c) 2008 Andrew Collier
 #   Copyright (c) 2011 Murray Cumming <murrayc at openismus.com>
+#   Copyright (c) 2015 Thibaut Paumard <thibaut.paumard at obspm.fr>
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@@ -63,11 +64,16 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+#   (Partial) History:
+#      2015-01-29, Thibaut Paumard: append swig3.0 to the list of
+#      executables to try.
+
 #serial 11
 
 AC_DEFUN([AX_PKG_SWIG],[
         # Ubuntu has swig 2.0 as /usr/bin/swig2.0
-        AC_PATH_PROGS([SWIG],[swig swig2.0])
+        # Debian has swig 3.0 as /usr/bin/swig3.0
+        AC_PATH_PROGS([SWIG],[swig swig2.0 swig3.0])
         if test -z "$SWIG" ; then
                 m4_ifval([$3],[$3],[:])
         elif test -n "$1" ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git