Build system: Rename BUILDING_FROM_SCM to BUILDING_FROM_VCS

This should avoid confunsion as in other variable SCM means scheme.

Makefile.am

@@ -201,7 +201,7 @@ po/gnucash.pot: po/POTFILES.in
 
 SVN = svn
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 # This rule will generate a ChangeLog of gnucash/trunk commits, plus
 # all additional branches that are added in
 # ./macros/svn2cl.xsl. (FIXME: Is the dependency on NEWS really a good

configure.ac

@@ -198,8 +198,8 @@ CFLAGS="${cflags_save}"
 # test whether we are building directly from svn/svk/git/bzr
 AC_MSG_CHECKING(if building from an scm managed directory)
 "$srcdir/util/gnc-scm-info" -r "$srcdir" >/dev/null 2>&1
-if test $? = 0 -o "x${BUILDING_FROM_SCM}" = "xyes" ; then
-  BUILDING_FROM_SCM=yes
+if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then
+  BUILDING_FROM_VCS=yes
   SCM_TYPE=$("$srcdir/util/gnc-scm-info" -t "$srcdir")
   AC_MSG_RESULT($SCM_TYPE)
 
@@ -215,7 +215,7 @@ if test $? = 0 -o "x${BUILDING_FROM_SCM}" = "xyes" ; then
   fi
 else
   AC_MSG_RESULT(no)
-  BUILDING_FROM_SCM=no
+  BUILDING_FROM_VCS=no
   SCM_TYPE=
 
   # Make sure we've got swig-runtime.h and gnc-scm-info.h
@@ -240,7 +240,7 @@ the tarball you downloaded is broken.
 
     ])])
 fi
-AM_CONDITIONAL(BUILDING_FROM_SCM, test "x$BUILDING_FROM_SCM" = "xyes")
+AM_CONDITIONAL(BUILDING_FROM_VCS, test "x$BUILDING_FROM_VCS" = "xyes")
 AC_SUBST(SCM_TYPE)
 AC_SUBST(GIT_CMD)
 
@@ -494,7 +494,7 @@ the intltool-ltdl development packages ?])])
 # with that tarball so we have to prepare the tarball for guile 2
 # compatibility.
 #
-if test "${BUILDING_FROM_SCM}" = yes
+if test "${BUILDING_FROM_VCS}" = yes
 then
     AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
 
@@ -1304,7 +1304,7 @@ then
   #warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall
 
   # error-on-warning should not be active in (stable) release tarballs
-  if test "x$BUILDING_FROM_SCM" = "xyes"
+  if test "x$BUILDING_FROM_VCS" = "xyes"
   then
     # This code is from svn/svk/git/bzr, so enable error-on-warning
     error_on_warning_as_default="yes"

src/Makefile.am

@@ -51,7 +51,7 @@ endif
 noinst_HEADERS = \
   swig-runtime.h
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-runtime.h:
 	$(SWIG) -guile -external-runtime $@
 endif

src/app-utils/Makefile.am

@@ -105,7 +105,7 @@ libgncmod_app_utils_la_LIBADD = \
   ${LIBXML2_LIBS} \
   ${LIBXSLT_LIBS}
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<

src/core-utils/Makefile.am

@@ -42,7 +42,7 @@ noinst_HEADERS = \
   gnc-path.h \
   gnc-uri-utils.h
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<

src/engine/Makefile.am

@@ -210,7 +210,7 @@ endif
 
 noinst_DATA = .scm-links
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 
 # The generated file depends on various libqof headers. Out of
 # laziness I only include a few here - more might be needed

src/gnc-module/Makefile.am

@@ -29,7 +29,7 @@ gncinclude_HEADERS = \
 
 noinst_DATA = .scm-links
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<

src/gnc-module/test/mod-bar/Makefile.am

@@ -22,7 +22,7 @@ libgncmodbar_la_LIBADD=libbar.la \
   $(GUILE_LIBS) \
   $(GLIB_LIBS)
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-bar.c: bar.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 if ! OS_WIN32

src/gnc-module/test/mod-baz/Makefile.am

@@ -26,7 +26,7 @@ libgncmodbaz_la_LIBADD = \
   $(GUILE_LIBS) \
   $(GLIB_LIBS)
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-baz.c: baz.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 if ! OS_WIN32

src/gnc-module/test/mod-foo/Makefile.am

@@ -27,7 +27,7 @@ EXTRA_DIST = \
   foo.i \
   gnucash/foo.scm
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-foo.c: foo.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 if ! OS_WIN32

src/gnome-utils/Makefile.am

@@ -225,7 +225,7 @@ if HAVE_X11_XLIB_H
   libgncmod_gnome_utils_la_LIBADD += -lX11
 endif
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-gnome-utils.c: gnome-utils.i \
                     ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \

src/gnome/Makefile.am

@@ -112,7 +112,7 @@ noinst_HEADERS = \
   window-reconcile2.h \
   window-autoclear.h
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<

src/html/Makefile.am

@@ -54,7 +54,7 @@ libgncmod_html_la_LIBADD = \
   ${GUILE_LIBS} \
   ${REGEX_LIBS}
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-gnc-html.c: gnc-html.i gnc-html.h \
                     ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \

src/optional/python-bindings/Makefile.am

@@ -38,7 +38,7 @@ _gnucash_core_c_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 _gnucash_core_c_includes= \
 	${top_builddir}/config.h \
 	${top_srcdir}/src/libqof/qof/qofsession.h \

src/pixmaps/Makefile.am

@@ -78,7 +78,7 @@ gncextrasmallicon_DATA = 16x16/gnucash-icon.png
 gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
 gncscalableicon_DATA = scalable/gnucash-icon.svg
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 256x256/gnucash-icon.png: gnucash-icon-256x256.png
 	-mkdir -p 256x256
 	cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png
@@ -161,7 +161,7 @@ EXTRA_DIST = \
   ${gncscalableicon_DATA}
 
 # Only clean up if we're building from svn/svk/git/bzr
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 clean-local:
 	-rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable
 endif

src/report/report-gnome/Makefile.am

@@ -49,7 +49,7 @@ libgncmod_report_gnome_la_LIBADD = \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<

src/report/report-system/Makefile.am

@@ -23,7 +23,7 @@ libgncmod_report_system_la_LIBADD = \
   ${GLIB_LIBS} \
   ${GTK_LIBS}
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<

src/test-core/Makefile.am

@@ -23,7 +23,7 @@ libtest_core_la_CPPFLAGS = \
 libtest_core_la_LDFLAGS = \
   -rpath ${exec-prefix}/lib
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src \

util/gnc-scm-info

@@ -26,14 +26,14 @@ my_die()
   exit 1
 }
 
-if [ "$BUILDING_FROM_SCM" = "0" -o \
-     "$BUILDING_FROM_SCM" = "no" -o \
-     "$BUILDING_FROM_SCM" = "false" ]; then
+if [ "$BUILDING_FROM_VCS" = "0" -o \
+     "$BUILDING_FROM_VCS" = "no" -o \
+     "$BUILDING_FROM_VCS" = "false" ]; then
   # Something outside of the Gnucash build system knows that we
   # are NOT building from svn, svk or git checkout.
   # We should believe it (needed by packagers that maintain the
   # packaging code in svn, svk or git too)
-  echo "Environment variable BUILDING_FROM_SCM=$BUILDING_FROM_SCM" >&2
+  echo "Environment variable BUILDING_FROM_VCS=$BUILDING_FROM_VCS" >&2
   exit 1
 fi