Changeset b726084 for configure

Timestamp:

Nov 9, 2016, 2:51:42 PM (9 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:

30b65d8, d073e3c

Parents:

141b786 (diff), 84118d8 (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/ControlStruct/LabelTypeChecker.cc
src/InitTweak/FixInit.cc
src/ResolvExpr/Resolver.cc
src/Tuples/TupleAssignment.cc
src/Tuples/TupleAssignment.h

File:

• configure (modified) (12 diffs)

configure

@@ -1 +1 @@
 #! /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 +561 @@
 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 +646 @@
 CFA_BACKEND_CC
 BACKEND_CC
-CONFIG_STATUS_DEPENDENCIES
 MAINT
 MAINTAINER_MODE_FALSE
@@ -1279 +1278 @@
   # 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 +1344 @@
 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 +1448 @@
 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 +2036 @@
 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 +2900 @@
 # Define the identity of the package.
  PACKAGE='cfa-cc'
- VERSION='1.0.0'
+ VERSION='1.0.0.0'
 
 
@@ -2965 +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'
-
+rm -f version
+echo ${PACKAGE_VERSION} > version               # file containing version number for other tools
+chmod ugo-w version
+ver_major=`cut -d '.' -f1 version`              # subdivide version number into components at periods
+ver_minor=`cut -d '.' -f2 version`
+ver_patch=`cut -d '.' -f3 version`
+ver_build=`cut -d '.' -f4 version`
+
+# AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version'])
 
 cat >>confdefs.h <<_ACEOF
@@ -2998 +2995 @@
 
 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 +6401 @@
 # 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 +6467 @@
 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\\"