Changeset cde3891 for libcfa/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

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:

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

libcfa/configure.ac

@@ -4 +4 @@
 AC_PREREQ([2.68])
 AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
-AC_CONFIG_AUX_DIR([./automake])
+AC_CONFIG_AUX_DIR([automake])
+AC_CONFIG_MACRO_DIRS([automake])
 AM_SILENT_RULES([yes])
 
@@ -14 +15 @@
 : ${CFLAGS=""}
 
+# define this to override
+AR_FLAGS="cr"
+
 # Allow program name tansformation
 # will fill program_transform_name with appropriate sed regex
@@ -21 +25 @@
 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])
+AC_ARG_VAR(CFA_VERSION, [The long version of cfa])
 
 CFACC=${DRIVER_DIR}cfa
@@ -26 +31 @@
 AC_SUBST(CFACC)
 AC_SUBST(CFACPP)
+AC_SUBST(CFA_VERSION)
 
 #==============================================================================
@@ -41 +47 @@
                 CONFIG_CFLAGS="-O0 -g"
                 CONFIG_CFAFLAGS="-debug"
+                CONFIG_BUILDLIB="yes"
         ;;
         "nodebug" )
                 CONFIG_CFLAGS="-O2 -s"
                 CONFIG_CFAFLAGS="-nodebug"
+                CONFIG_BUILDLIB="yes"
         ;;
         "nolib"   )
-                CONFIG_CFLAGS=""
-                CONFIG_CFAFLAGS=""
+                CONFIG_CFLAGS="-O2 -s"
+                CONFIG_CFAFLAGS="-nodebug"
+                CONFIG_BUILDLIB="no"
+        ;;
+        *)
+        AC_MSG_ERROR('Invalid value $CONFIGURATION for \$CONFIGURATION')
         ;;
 esac
@@ -54 +66 @@
 AC_SUBST(CONFIG_CFLAGS)
 AC_SUBST(CONFIG_CFAFLAGS)
+AC_SUBST(CONFIG_BUILDLIB)
+
+AM_CONDITIONAL([BUILDLIB], [test "x${CONFIG_BUILDLIB}" = "xyes"])
 
 #==============================================================================
@@ -64 +79 @@
 
 # Checks for programs.
+LT_INIT
+
 AC_PROG_CXX
 AC_PROG_CC
 AM_PROG_AS
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 
 AC_CONFIG_FILES([