Changeset be8bd88 for configure

Timestamp:

Mar 8, 2017, 3:22:50 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

031a2c95, 0e7ea335

Parents:

87c3bef (diff), 6363ad1 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• configure (modified) (6 diffs)

configure

@@ -668 +668 @@
 CFA_BACKEND_CC
 BACKEND_CC
+CFA_NAME
 MAINT
 MAINTAINER_MODE_FALSE
@@ -741 +742 @@
 enable_silent_rules
 enable_maintainer_mode
+with_cfa_name
 with_backend_compiler
 enable_target_release
@@ -1397 +1399 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-cfa-name=NAME     NAME too which cfa will be installed
   --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible)
 
@@ -3001 +3004 @@
                         # may require auto* software to be installed
 
+# Allow program name tansformation
+# will fille program_transform_name with appropriate sed regex
+
+#autoconf escapes $ and \ since automake wiill un-escape them.
+#Since we need to use the sed transform in autoconf we need to manualy un-escape these characters
+name_transform=`echo ${program_transform_name} | sed 's/\\$\\$/\\$/g' | sed 's/\\\\\\\/\\\/g'`
+cfa_name=`echo cfa | sed ${name_transform}`
+cc1_name=`echo cc1 | sed ${name_transform}`
+cpp_name=`echo cfa-cpp | sed ${name_transform}`
+
+#Trasforming cc1 will break compilation
+if ! test "${cc1_name}" = "cc1"; then
+    as_fn_error $? "Program transform must not modify cc1.
+                --program-sufix and --program-prefix not supported.
+                Use -program-transform-name='s/cfa$/[Desired name here]/' instead" "$LINENO" 5
+fi
+#We could support transforming cfa-cpp but since it is located in a unique subfolder we don't need to
+if ! test "${cpp_name}" = "cfa-cpp"; then
+    as_fn_error $? "Program transform must not modify cfa-cpp.
+                --program-sufix and --program-prefix not supported.
+                Use -program-transform-name='s/cfa$/[Desired name here]/' instead" "$LINENO" 5
+fi
+
+
+# Check whether --with-cfa-name was given.
+if test "${with_cfa_name+set}" = set; then :
+  withval=$with_cfa_name; cfa_name=$withval
+else
+  cfa_name="cfa"
+fi
+
+
+#Define the new name of the installed command
+CFA_NAME=${cfa_name}
+
+
 rm -f version
 echo ${PACKAGE_VERSION} > version               # file containing version number for other tools
@@ -3238 +3277 @@
 
 if test "$includedir" = '${prefix}/include'; then
-        cfa_incdir="${cfa_prefix}/include/cfa"
+        cfa_incdir="${cfa_prefix}/include/${cfa_name}"
 else
         cfa_incdir=${includedir}
@@ -3264 +3303 @@
 
 if test "$libdir" = '${exec_prefix}/lib'; then
-        cfa_libdir=${cfa_prefix}/lib
+        cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
 else
         cfa_libdir=${libdir}