Index: .gitignore
===================================================================
--- .gitignore	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ .gitignore	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -12,4 +12,5 @@
 libcfa/Makefile
 src/Makefile
+version
 
 # genereted by premake
Index: Makefile.in
===================================================================
--- Makefile.in	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ Makefile.in	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -132,5 +132,4 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: configure
===================================================================
--- configure	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ configure	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -1,5 +1,5 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for cfa-cc 1.0.0.
+# Generated by GNU Autoconf 2.68 for cfa-cc 1.0.0.0.
 #
 # Report bugs to <cforall@plg.uwaterloo.ca>.
@@ -561,6 +561,6 @@
 PACKAGE_NAME='cfa-cc'
 PACKAGE_TARNAME='cfa-cc'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='cfa-cc 1.0.0'
+PACKAGE_VERSION='1.0.0.0'
+PACKAGE_STRING='cfa-cc 1.0.0.0'
 PACKAGE_BUGREPORT='cforall@plg.uwaterloo.ca'
 PACKAGE_URL=''
@@ -646,5 +646,4 @@
 CFA_BACKEND_CC
 BACKEND_CC
-CONFIG_STATUS_DEPENDENCIES
 MAINT
 MAINTAINER_MODE_FALSE
@@ -1279,5 +1278,5 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cfa-cc 1.0.0 to adapt to many kinds of systems.
+\`configure' configures cfa-cc 1.0.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,5 +1344,5 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cfa-cc 1.0.0:";;
+     short | recursive ) echo "Configuration of cfa-cc 1.0.0.0:";;
    esac
   cat <<\_ACEOF
@@ -1449,5 +1448,5 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-cfa-cc configure 1.0.0
+cfa-cc configure 1.0.0.0
 generated by GNU Autoconf 2.68
 
@@ -2037,5 +2036,5 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cfa-cc $as_me 1.0.0, which was
+It was created by cfa-cc $as_me 1.0.0.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
@@ -2901,5 +2900,5 @@
 # Define the identity of the package.
  PACKAGE='cfa-cc'
- VERSION='1.0.0'
+ VERSION='1.0.0.0'
 
 
@@ -2965,15 +2964,11 @@
 			# may require auto* software to be installed
 
-ver_major=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
-ver_minor=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\2/'`
-ver_patch=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\3/'`
-ver_build=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\4/'`
-ver_short="\"${ver_major}\""
-ver__long="\"${ver_major}.${ver_minor}\""
-ver__norm="\"${ver_major}.${ver_minor}.${ver_patch}\""
-ver__full="\"${ver_major}.${ver_minor}.${ver_patch}.${ver_build}\""
-
-CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/version'
-
+echo ${PACKAGE_VERSION} > version
+ver_major=`echo ${PACKAGE_VERSION} | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
+ver_minor=`echo ${PACKAGE_VERSION} | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\2/'`
+ver_patch=`echo ${PACKAGE_VERSION} | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\3/'`
+ver_build=`echo ${PACKAGE_VERSION} | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\4/'`
+
+# AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version'])
 
 cat >>confdefs.h <<_ACEOF
@@ -2998,20 +2993,20 @@
 
 cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_SHORT ${ver_short}
+#define CFA_VERSION_SHORT "${ver_major}"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION ${ver__long}
+#define CFA_VERSION "${ver_major}.${ver_minor}"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_LONG ${ver__norm}
+#define CFA_VERSION_LONG "${ver_major}.${ver_minor}.${ver_patch}"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_FULL ${ver__full}
+#define CFA_VERSION_FULL "${ver_major}.${ver_minor}.${ver_patch}.${ver_build}"
 _ACEOF
 
@@ -6404,5 +6399,5 @@
 # values after options handling.
 ac_log="
-This file was extended by cfa-cc $as_me 1.0.0, which was
+This file was extended by cfa-cc $as_me 1.0.0.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
@@ -6470,5 +6465,5 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cfa-cc config.status 1.0.0
+cfa-cc config.status 1.0.0.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
Index: configure.ac
===================================================================
--- configure.ac	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ configure.ac	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -3,5 +3,5 @@
 
 AC_PREREQ([2.68])
-AC_INIT([cfa-cc],[1.0.0],[cforall@plg.uwaterloo.ca])
+AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
 AC_CONFIG_AUX_DIR([automake])
 #AC_CONFIG_SRCDIR([src/main.cc])
@@ -18,22 +18,19 @@
 AM_MAINTAINER_MODE(enable)			# may require auto* software to be installed
 
-ver_major=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\1/'`
-ver_minor=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\2/'`
-ver_patch=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\3/'`
-ver_build=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\4/'`
-ver_short="\"${ver_major}\""
-ver__long="\"${ver_major}.${ver_minor}\""
-ver__norm="\"${ver_major}.${ver_minor}.${ver_patch}\""
-ver__full="\"${ver_major}.${ver_minor}.${ver_patch}.${ver_build}\""
+echo ${PACKAGE_VERSION} > version
+ver_major=`echo ${PACKAGE_VERSION} | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\1/'`
+ver_minor=`echo ${PACKAGE_VERSION} | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\2/'`
+ver_patch=`echo ${PACKAGE_VERSION} | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\3/'`
+ver_build=`echo ${PACKAGE_VERSION} | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\4/'`
 
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version'])
+# AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version'])
 AC_DEFINE_UNQUOTED(CFA_VERSION_MAJOR, ${ver_major}, [Major version number.])
 AC_DEFINE_UNQUOTED(CFA_VERSION_MINOR, ${ver_minor}, [Minor version number.])
 AC_DEFINE_UNQUOTED(CFA_VERSION_PATCH, ${ver_patch}, [Patch version number.])
 AC_DEFINE_UNQUOTED(CFA_VERSION_BUILD, ${ver_build}, [Build version number.])
-AC_DEFINE_UNQUOTED(CFA_VERSION_SHORT, ${ver_short}, [Major])
-AC_DEFINE_UNQUOTED(CFA_VERSION, ${ver__long}, [Major.Minor])
-AC_DEFINE_UNQUOTED(CFA_VERSION_LONG, ${ver__norm}, [Major.Minor.Patch])
-AC_DEFINE_UNQUOTED(CFA_VERSION_FULL, ${ver__full}, [Major.Minor.Patch.Build])
+AC_DEFINE_UNQUOTED(CFA_VERSION_SHORT, ["${ver_major}"], [Major])
+AC_DEFINE_UNQUOTED(CFA_VERSION, ["${ver_major}.${ver_minor}"], [Major.Minor])
+AC_DEFINE_UNQUOTED(CFA_VERSION_LONG, ["${ver_major}.${ver_minor}.${ver_patch}"], [Major.Minor.Patch])
+AC_DEFINE_UNQUOTED(CFA_VERSION_FULL, ["${ver_major}.${ver_minor}.${ver_patch}.${ver_build}"], [Major.Minor.Patch.Build])
 
 # Installation paths
Index: src/driver/Makefile.am
===================================================================
--- src/driver/Makefile.am	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ src/driver/Makefile.am	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 08:49:31 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Jan 28 09:04:40 2016
-## Update Count     : 7
+## Last Modified On : Fri Oct 28 13:46:06 2016
+## Update Count     : 10
 ###############################################################################
 
@@ -26,6 +26,3 @@
 cc1_SOURCES = cc1.cc
 
-cfa.cc : ${abs_top_srcdir}/version
-	@true
-
 MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
Index: src/driver/Makefile.in
===================================================================
--- src/driver/Makefile.in	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ src/driver/Makefile.in	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -100,5 +100,4 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -543,7 +542,4 @@
 
 
-cfa.cc : ${abs_top_srcdir}/version
-	@true
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ src/driver/cfa.cc	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Oct 25 21:29:48 2016
-// Update Count     : 152
+// Last Modified On : Thu Oct 27 22:19:37 2016
+// Update Count     : 154
 //
 
@@ -50,7 +50,9 @@
 
 
+#define str(s) #s
+
 int main( int argc, char *argv[] ) {
-	string Version( CFA_VERSION_LONG );							// current version number from CONFIG
-	string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
+	string Version( CFA_VERSION_LONG );					// current version number from CONFIG
+	string Major( str( CFA_VERSION_MAJOR ) ), Minor( str( CFA_VERSION_MINOR ) ), Patch( str( CFA_VERSION_PATCH ) );
 
 	string installincdir( CFA_INCDIR );					// fixed location of include files
Index: src/examples/Makefile.in
===================================================================
--- src/examples/Makefile.in	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ src/examples/Makefile.in	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -111,5 +111,4 @@
 # applies to both programs
 CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ src/libcfa/Makefile.in	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -137,5 +137,4 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = -quiet -no-include-stdhdr -g -Wall -Wno-unused-function @CFA_FLAGS@ -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
+++ src/tests/Makefile.in	(revision 4b1afb612226e0433d5fc67b4d46e47789cfa3df)
@@ -121,5 +121,4 @@
 # applies to both programs
 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@