Changeset cde3891 for configure.ac

Timestamp:

Jan 23, 2019, 4:52:16 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

a200795

Parents:

9b086ca (diff), 1d832f4 (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' into cleanup-dtors

File:

• configure.ac (modified) (5 diffs)

configure.ac

@@ -5 +5 @@
 AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
 AC_CONFIG_AUX_DIR([automake])
+AC_CONFIG_MACRO_DIRS([automake])
 #AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_HEADERS([config.h:src/config.h.in])
@@ -55 +56 @@
 AC_SUBST([DOendif])
 AM_SUBST_NOTMAKE([DOendif])
-
-#==============================================================================
-# backend compiler implementation
-AC_ARG_WITH(backend-compiler,
-       [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
-       backendcompiler=$withval, backendcompiler="")
-if test "x$backendcompiler" != "x"; then
-       BACKEND_CC=${backendcompiler}
-else
-       AC_PATH_PROG(BACKEND_CC, gcc, [])       # check gcc installed
-       if test "x$BACKEND_CC" = "x"; then
-               AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
-               exit 1
-       fi
-fi
-AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
-AC_SUBST(CFA_BACKEND_CC)
 
 #==============================================================================
@@ -172 +156 @@
         echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data
         echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data
-        echo -n "CONFIGURATION=${lib_config}" >> ${lib_dir}/config.data
+        echo -n "CONFIGURATION=${lib_config} " >> ${lib_dir}/config.data
+        echo -n "CFA_VERSION=${ver_major}:${ver_minor}:${ver_patch}" >> ${lib_dir}/config.data
 done
 
@@ -199 +184 @@
 AC_PROG_LEX
 if test "${LEX}" = "lex" ; then echo "Error: flex required." ; exit 1 ; fi
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 
 # Checks for libraries.
+AC_CHECK_LIB([fibre], [Fibre::yield], [HAVE_LIBFIBRE=1], [HAVE_LIBFIBRE=0])
+AM_CONDITIONAL([WITH_LIBFIBRE], [test "$HAVE_LIBFIBRE" -eq 1])
 
 # Checks for header files.
@@ -225 +212 @@
 
 #==============================================================================
+# backend compiler implementation
+AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${CC}", [Backend compiler to use.])
+AC_SUBST(CFA_BACKEND_CC)
+
+#==============================================================================
 AC_CONFIG_FILES([
         Makefile