r23747 - gnucash/trunk - Require swig 2.0.10 when building from svn/git

Geert Janssens gjanssens at code.gnucash.org
Thu Jan 23 04:21:53 EST 2014


Author: gjanssens
Date: 2014-01-23 04:21:53 -0500 (Thu, 23 Jan 2014)
New Revision: 23747
Trac: http://svn.gnucash.org/trac/changeset/23747

Modified:
   gnucash/trunk/configure.ac
Log:
Require swig 2.0.10 when building from svn/git

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2014-01-22 23:36:48 UTC (rev 23746)
+++ gnucash/trunk/configure.ac	2014-01-23 09:21:53 UTC (rev 23747)
@@ -476,27 +476,20 @@
 ### --------------------------------------------------------------------------
 ### SWIG version checks (only when building from SCM)
 #
-# We need at least version 1.3.31 of SWIG because
-# that's when SWIG doesn't barf on the "inline" keyword in C headers anymore
-# In addition, guile 2 support only landed in SWIG 2.0.10
+# We need at least version 2.0.10 of SWIG because that's the first version
+# that supports guile 2
+# For a guile 1.8 build we could have gotten away with an older version
+# but we need to apply a patch to the swig generated files that needs to
+# go into the release tarball. At that point we don't know yet which
+# version of guile will be used together with that tarball so we have
+# to prepare the tarball for guile 2 compatibility.
 if test "${BUILDING_FROM_SCM}" = yes
 then
-  if test "${gnc_have_guile_2}" = yes
-  then
     AX_PKG_SWIG(2.0.10, [],
                 [AC_MSG_ERROR([
     You are building from ${SCM_TYPE} but swig was not found or too old.
-    To build gnucash with guile 2 you need at least swig version 2.0.10.
-    If that version is not available for your platform, you can try to
-    build against guile 1.8, which also works with older versions of swig.
+    To build gnucash you need at least swig version 2.0.10.
   ])])
-  else
-    AX_PKG_SWIG(1.3.31, [],
-                [AC_MSG_ERROR([
-    You are building from ${SCM_TYPE} but swig was not found or too old.
-    To build gnucash with guile 1.8 you need at least swig version 1.3.31.
-  ])])
-  fi
 fi
 ### --------------------------------------------------------------------------
 ### LIBXML -- GNOME_XML_LIB is defined by GNOME_XML_CHECK



More information about the gnucash-changes mailing list