Changeset e99e43f for libcfa/configure.ac

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (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.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• libcfa/configure.ac (modified) (6 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)
 
 #==============================================================================
@@ -53 +59 @@
                 CONFIG_BUILDLIB="no"
         ;;
+        *)
+        AC_MSG_ERROR('Invalid value $CONFIGURATION for \$CONFIGURATION')
+        ;;
 esac
 
@@ -70 +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([