Changes in / [0e7ea335:be8bd88]

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)

configure

@@ -3005 +3005 @@
 
 # Allow program name tansformation
-# will fill program_transform_name with appropriate sed regex
-
+# 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 "${program_transform_name}" = ""; then
-    as_fn_error $? "Program transform not supported.
-                Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
+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
 

configure.ac

@@ -23 +23 @@
 
 #Trasforming cc1 will break compilation
-if test "${program_transform_name}" = ""; then
+if ! test "${program_transform_name}" = ""; then
     AC_MSG_ERROR([Program transform not supported.
                 Use --with-cfa-name='[[Desired name here]]' instead])