Changeset 534e4e4 for configure.ac

Timestamp:

Aug 3, 2018, 4:05:38 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, 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:

4dcaed2

Parents:

ba9baad

Message:

Some clean-up before tackling finding directories

File:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -8 +8 @@
 AC_CONFIG_HEADERS([config.h:src/config.h.in])
 AM_SILENT_RULES([no])
+
+m4_include([automake/cfa.m4])
 
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -81 +83 @@
 #==============================================================================
 # 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
 
 #==============================================================================
@@ -142 +114 @@
 do
         #strip quotes surrouding values
-        var=$(echo $var | sed s/\'//g)
         case $var in
                 # skip cross compilation related arguments
-                --host=*) ;; host_alias=*) ;; --build=*) ;; build_alias=*) ;; --target=*) ;; target_alias=*) ;;
+                \'--host=*) ;; \'host_alias=*) ;; \'--build=*) ;; \'build_alias=*) ;; \'--target=*) ;; \'target_alias=*) ;;
 
                 # skip the target hosts
-                --with-target-hosts=*) ;;
+                \'--with-target-hosts=*) ;;
 
                 # append all other arguments to the sub configure arguments
@@ -172 +143 @@
 do
         # call your procedure/other scripts here below
-        lib_arch=$(echo $i | sed -r "s/:(.*)//g")
+        arch_name=$(echo $i | sed -r "s/:(.*)//g")
         lib_config=$(echo $i | sed -r "s/(.*)://g")
+        if test $lib_config != "nodebug";
+        then
+                if test $lib_config != "debug";
+                then
+                        if test $lib_config != "nolib";
+                        then
+                                >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
+                                exit 1
+                        fi
+                fi
+        fi
+
+        lib_arch=$($ac_aux_dir/config.sub $arch_name)
+        if test "$?" != "0"; then
+                >&2 echo "Unkown architecture " $arch_name;
+                exit 1;
+        fi
         lib_dir="libcfa-${lib_arch}-${lib_config}"