Changeset 91788fa for configure

Timestamp:

Jul 25, 2018, 6:23:58 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

a95c117, f0b3f51

Parents:

40a7d9c (diff), e89f4b1 (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' of plg2:software/cfa/cfa-cc

File:

• configure (modified) (4 diffs)

configure

@@ -2492 +2492 @@
 
 #AC_CONFIG_SRCDIR([src/main.cc])
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h:src/config.h.in"
 
 # Check whether --enable-silent-rules was given.
@@ -6295 +6295 @@
 
 
+ac_config_files="$ac_config_files src/tests/config.py"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7048 +7050 @@
 do
   case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:src/config.h.in" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -7061 +7063 @@
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/prettyprinter/Makefile") CONFIG_FILES="$CONFIG_FILES tools/prettyprinter/Makefile" ;;
+    "src/tests/config.py") CONFIG_FILES="$CONFIG_FILES src/tests/config.py" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;