r15013 - gnucash/branches/swig-redo - Conditionalize swig to SVN/SVK builds only.

[Derek Atkins]

Author: warlord
Date: 2006-10-12 18:15:22 -0400 (Thu, 12 Oct 2006)
New Revision: 15013
Trac: http://svn.gnucash.org/trac/changeset/15013

Modified:
   gnucash/branches/swig-redo/configure.in
Log:
Conditionalize swig to SVN/SVK builds only.
- add an AM_CONDITIONAL:  BUILDING_FROM_SVN
- only test for swig in configure when building from SVN
TODO: Update Makefiles to conditionalize swig.

Modified: gnucash/branches/swig-redo/configure.in
===================================================================
--- gnucash/branches/swig-redo/configure.in	2006-10-12 21:26:19 UTC (rev 15012)
+++ gnucash/branches/swig-redo/configure.in	2006-10-12 22:15:22 UTC (rev 15013)
@@ -116,10 +116,19 @@
   AC_MSG_ERROR([Cannot find ltdl.h -- libtool-devel (or libtool-ltdl-devel) not installed?])
 fi
 
-# We need at least version 1.3.28 to build properly.
-# 1.3.28 added %delobject
-AC_PROG_SWIG(1.3.28)
+# test whether we are building directly from SVN/SVK
+${srcdir}/util/gnc-svnversion ${srcdir} >/dev/null 2>&1
+if test $? = 0 ; then
+  BUILDING_FROM_SVN=yes
 
+  # We need at least version 1.3.28 of SWIG because
+  # that's when SWIG added %delobject
+  AC_PROG_SWIG(1.3.28)
+else
+  BUILDING_FROM_SVN=no
+fi
+AM_CONDITIONAL(BUILDING_FROM_SVN, test "x$BUILDING_FROM_SVN" = "xyes")
+
 # These are unavailable on windows/mingw32
 AC_CHECK_HEADERS(X11/Xlib.h glob.h)
 AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
@@ -1977,8 +1986,7 @@
   #warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall
 
   # error-on-warning should not be active in (stable) release tarballs
-  ${srcdir}/util/gnc-svnversion ${srcdir} >/dev/null 2>&1
-  if test $? = 0
+  if test "x$BUILDING_FROM_SVN" = "xyes"
   then
     # This code is from SVN/SVK, so enable error-on-warning
     error_on_warning_as_default="yes"