Changes in configure.ac [5222605:df47e2f]

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -19 +19 @@
 
 # Allow program name tansformation
-# will fill program_transform_name with appropriate sed regex
+# will fille program_transform_name with appropriate sed regex
 AC_ARG_PROGRAM
+#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
-    AC_MSG_ERROR([Program transform not supported.
-                Use --with-cfa-name='[[Desired name here]]' instead])
-fi
-
-AC_ARG_WITH(cfa-name,
-        [  --with-cfa-name=NAME     NAME too which cfa will be installed],
-        cfa_name=$withval, cfa_name="cfa")
+if ! test "${cc1_name}" = "cc1"; then
+    AC_MSG_ERROR([Program transform must not modify cc1.
+                --program-sufix and --program-prefix not supported.
+                Use -program-transform-name='s/cfa$/[[Desired name here]]/' instead])
+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
+    AC_MSG_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])
+fi
 
 #Define the new name of the installed command
@@ -169 +178 @@
 AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
 
-AC_CANONICAL_BUILD
+AC_DEFINE_UNQUOTED(CFA_FLAGS, "${CFAFLAGS}", [compilation flags for cfa libraries and test programs.])
+AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
+
 AC_CANONICAL_HOST
 AC_SUBST([MACHINE_TYPE],[$host_cpu])
-
-if ! test "$host_cpu" = "$build_cpu"; then 
-        case $host_cpu in
-                i386)
-                        CFLAGS+="-m32"
-                        CXXFLAGS+="-m32"
-                        CFAFLAGS+="-m32"
-                        LDFLAGS+="-m32"
-                        ;;
-                i686)
-                        CFLAGS+="-m32"
-                        CXXFLAGS+="-m32"
-                        CFAFLAGS+="-m32"
-                        LDFLAGS+="-m32"
-                        ;;
-                x86_64)
-                        CFLAGS+="-m64"
-                        CXXFLAGS+="-m64"
-                        CFAFLAGS+="-m64"
-                        LDFLAGS+="-m64"
-                        ;;
-        esac
-fi
-
-AC_DEFINE_UNQUOTED(CFA_FLAGS, "${CFAFLAGS}", [compilation flags for cfa libraries and test programs.])
-AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
 
 # Checks for programs.