Changeset 37fe352 for libcfa/configure.ac

Timestamp:

Aug 5, 2018, 4:11:41 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

28582b2

Parents:

4dcaed2

Message:

Added proper multi-lib handling, tests still do not work and arm support is broken

File:

• libcfa/configure.ac (modified) (3 diffs)

libcfa/configure.ac

@@ -6 +6 @@
 AC_CONFIG_AUX_DIR([./automake])
 
+m4_include([../automake/cfa.m4])
+
 AM_INIT_AUTOMAKE([subdir-objects])
 
@@ -12 +14 @@
 AC_ARG_PROGRAM
 
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-
+AC_ARG_VAR(ARCHITECTURE,  [The architecture  to use when building libcfa])
 AC_ARG_VAR(CONFIGURATION, [The configuration to use when building libcfa, options are: deubg, nodebug, nolib (prelude-only)])
 AC_ARG_VAR(DRIVER_DIR, [The path to the cforall driver directory])
@@ -23 +23 @@
 AC_SUBST(CFACPP)
 
+case $ARCHITECTURE in
+        "x64"        ) ARCH_FLAGS="-m64";;
+        "x86"        ) ARCH_FLAGS="-m32";;
+        "arm"        ) ARCH_FLAGS="";;
+esac
+
+AC_SUBST(ARCH_FLAGS)
+
+#==============================================================================
+#Trasforming cc1 will break compilation
+M4CFA_PROGRAM_NAME
+
 #==============================================================================
 # Installation paths
-if test "x$prefix" = "xNONE"; then
-        cfa_prefix=${ac_default_prefix}
-else
-        cfa_prefix=${prefix}
-fi
-AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
-AC_SUBST(CFA_PREFIX, ${cfa_prefix})
-
-if test "$includedir" = '${prefix}/include'; then
-        cfa_incdir="${cfa_prefix}/include/${cfa_name}"
-else
-        cfa_incdir=${includedir}
-fi
-AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
-AC_SUBST(CFA_INCDIR, ${cfa_incdir})
-
-if test "$bindir" = '${exec_prefix}/bin'; then
-        cfa_bindir="${cfa_prefix}/bin"
-else
-        cfa_bindir=${bindir}
-fi
-AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
-AC_SUBST(CFA_BINDIR, ${cfa_bindir})
-
-if test "$libdir" = '${exec_prefix}/lib'; then
-        cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
-else
-        cfa_libdir=${libdir}
-fi
-AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
-AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
+M4CFA_PARSE_PREFIX
 
 # Checks for programs.