Changeset 3f0c6a5 for configure

Timestamp:

Oct 28, 2016, 1:40:31 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

066d77a

Parents:

77971f6 (diff), 47a8d17 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into tuples

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

File:

• configure (modified) (2 diffs)

configure

@@ -646 +646 @@
 CFA_BACKEND_CC
 BACKEND_CC
+CONFIG_STATUS_DEPENDENCIES
 MAINT
 MAINTAINER_MODE_FALSE
@@ -2963 +2964 @@
 
                         # 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'
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_MAJOR ${ver_major}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_MINOR ${ver_minor}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_PATCH ${ver_patch}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_BUILD ${ver_build}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_SHORT ${ver_short}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION ${ver__long}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_LONG ${ver__norm}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_FULL ${ver__full}
+_ACEOF
+
 
 # Installation paths