Changeset f80e0218 for configure

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• configure (modified) (11 diffs)

configure

@@ -643 +643 @@
 CFA_INCDIR
 CFA_PREFIX
+CFA_BACKEND_CC
 BACKEND_CC
-GCC_PATH
 MAINT
 MAINTAINER_MODE_FALSE
@@ -671 +671 @@
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 target_alias
 host_alias
@@ -712 +716 @@
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_maintainer_mode
 with_backend_compiler
@@ -1346 +1351 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --disable-maintainer-mode  disable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer
@@ -2408 +2415 @@
 ac_config_headers="$ac_config_headers config.h"
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+        @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 
 if test "x${CXXFLAGS}" = "x"; then
@@ -2922 +2968 @@
 # Check whether --with-backend-compiler was given.
 if test "${with_backend_compiler+set}" = set; then :
-  withval=$with_backend_compiler; backcompiler=$withval
-else
-  backcompiler=""
-fi
-
-  if test x$backcompiler != x; then
-        cat >>confdefs.h <<_ACEOF
-#define GCC_PATH "${backcompiler}"
-_ACEOF
-
-        BACKEND_CC=${backcompiler}
-  else
+  withval=$with_backend_compiler; backendcompiler=$withval
+else
+  backendcompiler=""
+fi
+
+if test "x$backendcompiler" != x; then
+        BACKEND_CC=${backendcompiler}
+else
         # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GCC_PATH+:} false; then :
+if ${ac_cv_path_BACKEND_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GCC_PATH in
+  case $BACKEND_CC in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_GCC_PATH="$GCC_PATH" # Let the user override the test with a path.
+  ac_cv_path_BACKEND_CC="$BACKEND_CC" # Let the user override the test with a path.
   ;;
   *)
@@ -2953 +2995 @@
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GCC_PATH="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_BACKEND_CC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2961 +3003 @@
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_GCC_PATH" && ac_cv_path_GCC_PATH="N/A"
   ;;
 esac
 fi
-GCC_PATH=$ac_cv_path_GCC_PATH
-if test -n "$GCC_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_PATH" >&5
-$as_echo "$GCC_PATH" >&6; }
+BACKEND_CC=$ac_cv_path_BACKEND_CC
+if test -n "$BACKEND_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BACKEND_CC" >&5
+$as_echo "$BACKEND_CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -2975 +3016 @@
 
 
-        if test "$GCC_PATH" = "N/A"; then
+        if test "x$BACKEND_CC" = "x"; then
                 as_fn_error $? "some version of gcc is needed. Get it at ftp://ftp.gnu.org" "$LINENO" 5
                 exit 1
         fi
+fi
 
 cat >>confdefs.h <<_ACEOF
-#define GCC_PATH "${GCC_PATH}"
-_ACEOF
-
-        BACKEND_CC=${GCC_PATH}
-  fi
+#define CFA_BACKEND_CC "${BACKEND_CC}"
+_ACEOF
+
 
 
@@ -5757 +5797 @@
 
 
-ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/examples/Makefile src/libcfa/Makefile"
+ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/examples/Makefile src/tests/Makefile src/libcfa/Makefile"
 
 
@@ -6503 +6543 @@
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
+    "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
     "src/libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcfa/Makefile" ;;