gnucash master: Multiple changes pushed

[Frank H. Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash/commit/daf66df6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/10b3ac44 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b6337085 (commit)



commit daf66df6c7fc97ff87e594a06e05bf9683e5fe21
Merge: b633708 10b3ac4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Mar 31 10:05:22 2015 +0200

    Merge branch 'maint'


commit 10b3ac4489eba72c68bbb6f71f24aa08810c33a1
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Mar 31 07:12:24 2015 +0200

    Build system: Rename SCM_TYPE to VCS_TYPE
    
    Follow up of the 2 previous commits.

diff --git a/Makefile.am b/Makefile.am
index 7427129..ee1a3b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,12 +209,12 @@ if BUILDING_FROM_VCS
 # change, so this should fit just fine.)
 ChangeLog: NEWS
 	cd $(abs_srcdir) ; \
-	if test x$(SCM_TYPE) = xsvn ; then \
+	if test x$(VCS_TYPE) = xsvn ; then \
 	  $(SVN) log -v --xml -r HEAD:'{2015-01-01}' http://svn.gnucash.org/repo/gnucash | \
 	    $(XSLTPROC) --stringparam strip-prefix "gnucash/trunk" \
 	    --stringparam include-rev "yes" $(abs_srcdir)/macros/svn2cl.xsl - > $(abs_builddir)/$@ ; \
 	else \
-	  if test x$(SCM_TYPE) = xgit ; then \
+	  if test x$(VCS_TYPE) = xgit ; then \
 	    "$(GIT_CMD)" log --format="%ad %aN %n%n%x09* %s%d%n" --date=short --since=2013-01-01 > $(abs_builddir)/$@ ; \
 	  else \
 	    touch $(abs_builddir)/$@ ; \
diff --git a/configure.ac b/configure.ac
index 87ee5c5..1f33d3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,10 +200,10 @@ AC_MSG_CHECKING(if building from an scm managed directory)
 "$srcdir/util/gnc-vcs-info" -r "$srcdir" >/dev/null 2>&1
 if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then
   BUILDING_FROM_VCS=yes
-  SCM_TYPE=$("$srcdir/util/gnc-vcs-info" -t "$srcdir")
-  AC_MSG_RESULT($SCM_TYPE)
+  VCS_TYPE=$("$srcdir/util/gnc-vcs-info" -t "$srcdir")
+  AC_MSG_RESULT($VCS_TYPE)
 
-  if test "x${SCM_TYPE}" = "xgit"; then
+  if test "x${VCS_TYPE}" = "xgit"; then
     AC_MSG_CHECKING(git command to use due to detected git repo)
     # The windows build uses environment variable $GIT_CMD to invoke git (adding git
     # to the PATH in Windows results in a build failure).
@@ -216,7 +216,7 @@ if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then
 else
   AC_MSG_RESULT(no)
   BUILDING_FROM_VCS=no
-  SCM_TYPE=
+  VCS_TYPE=
 
   # Make sure we've got swig-runtime.h and gnc-vcs-info.h
   AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
@@ -241,7 +241,7 @@ the tarball you downloaded is broken.
     ])])
 fi
 AM_CONDITIONAL(BUILDING_FROM_VCS, test "x$BUILDING_FROM_VCS" = "xyes")
-AC_SUBST(SCM_TYPE)
+AC_SUBST(VCS_TYPE)
 AC_SUBST(GIT_CMD)
 
 # Build dir adjustments
@@ -503,7 +503,7 @@ then
         if test "${gnc_have_swig_2_0_10}" = no
         then
             AC_MSG_ERROR([
-    You are building from ${SCM_TYPE} but swig was not found or too old.
+    You are building from ${VCS_TYPE} but swig was not found or too old.
     To build gnucash you need at least swig version 2.0.10.
             ])
         fi
@@ -512,7 +512,7 @@ then
         then
             AX_PKG_SWIG(1.3.31, [],
                 [AC_MSG_ERROR([
-    You are building from ${SCM_TYPE} but swig was not found or too old.
+    You are building from ${VCS_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



Summary of changes:
 Makefile.am  |  4 ++--
 configure.ac | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)