Changes in automake/cfa.m4 [a5121bf:ae628e1]

File:

• automake/cfa.m4 (modified) (5 diffs)

automake/cfa.m4

@@ -6 +6 @@
                 cfa_prefix=${prefix}
         fi
+        cfa_prefix="$(readlink -f ${cfa_prefix})/"
         AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
         AC_SUBST(CFA_PREFIX, ${cfa_prefix})
@@ -14 +15 @@
                 cfa_incdir=${includedir}
         fi
+        cfa_incdir="$(readlink -f ${cfa_incdir})/"
         AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
         AC_SUBST(CFA_INCDIR, ${cfa_incdir})
@@ -22 +24 @@
                 cfa_bindir=${bindir}
         fi
+        cfa_bindir="$(readlink -f ${cfa_bindir})/"
         AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
         AC_SUBST(CFA_BINDIR, ${cfa_bindir})
@@ -34 +37 @@
                 cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
         fi
+        cfa_libdir="$(readlink -f ${cfa_libdir})/"
         AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
         AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
@@ -54 +58 @@
 AC_DEFUN([M4CFA_CANNON_CPU], [
         case $arch_name in
+                "host") arch_name=${host_cpu};;
+                *) ;;
+        esac
+
+        case $arch_name in
                 "x64"        ) cannon_arch_name="x64";;
                 "x86-64"     ) cannon_arch_name="x64";;