From 415813d284ce9ca3f22443ed9f7b054a9cf0c302 Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce@apache.org>
Date: Tue, 6 Nov 2012 15:51:07 +0000
Subject: QPID-4417: Add minimum Swig version check to autotools and Cmake

Any version of Swig < 1.3.32 results in errors in the Perl
language bindings. This change forces both build systems to require at
least version 1.3.32 of Swig in order to build those language bindings.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1406195 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/bindings/CMakeLists.txt | 7 +++++++
 cpp/configure.ac            | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'cpp')

diff --git a/cpp/bindings/CMakeLists.txt b/cpp/bindings/CMakeLists.txt
index 356b0d73a3..7f55377685 100644
--- a/cpp/bindings/CMakeLists.txt
+++ b/cpp/bindings/CMakeLists.txt
@@ -24,7 +24,14 @@ include(FindRuby)
 include(FindPythonLibs)
 include(FindPerlLibs)
 
+set (SWIG_MINIMUM_VERSION "1.3.32")
+
 if (SWIG_FOUND)
+
+    if (${SWIG_VERSION} VERSION_LESS ${SWIG_MINIMUM_VERSION})
+      message(FATAL_ERROR "Swig >= ${SWIG_MINIMUM_VERSION} required.")
+    endif()
+
     set(CMAKE_SWIG_FLAGS "-w361,362,401,467,503")
 
     if (PYTHONLIBS_FOUND)
diff --git a/cpp/configure.ac b/cpp/configure.ac
index e7e8053f43..29c1ddf1e1 100644
--- a/cpp/configure.ac
+++ b/cpp/configure.ac
@@ -146,7 +146,7 @@ AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"])
 AC_CHECK_PROG([RUBY], [ruby], [ruby])
 
 # Swig binding generator is needed for the script (Ruby, Python, etc.) bindings.
-AC_PROG_SWIG(1.3.26)
+AC_PROG_SWIG(1.3.32)
 test ! -x "$SWIG" && SWIG=""
 AC_ARG_WITH([swig],
   [AS_HELP_STRING([--with-swig], [Use swig to generate qmf bindings.])],
-- 
cgit v1.2.1