Changeset 4eb1db6 for configure

Timestamp:

Jun 2, 2015, 2:28:24 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, string, with_gc

Children:

954463b8

Parents:

d939274 (diff), c3a4385 (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 labels

File:

• configure (modified) (5 diffs)

configure

@@ -4528 +4528 @@
 
         # deprecated
+# These are often not installed and people miss seeing the "no", so stop the configure.
 for ac_prog in 'bison -y' byacc
 do
@@ -4571 +4572 @@
 test -n "$YACC" || YACC="yacc"
 
+if test "${YACC}" = "yacc" ; then echo "Error: bison required." ; exit 1 ; fi
 
 for ac_prog in flex lex
@@ -4730 +4732 @@
 
 fi
+if test "${LEX}" = "lex" ; then echo "Error: flex required." ; exit 1 ; fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -5749 +5752 @@
 
 
-ac_config_files="$ac_config_files Makefile driver/Makefile src/Makefile src/examples/Makefile libcfa/Makefile"
+ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/examples/Makefile src/libcfa/Makefile"
 
 
@@ -6492 +6495 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "driver/Makefile") CONFIG_FILES="$CONFIG_FILES driver/Makefile" ;;
+    "src/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/driver/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
-    "libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES libcfa/Makefile" ;;
+    "src/libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcfa/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;