Merged in autoconf branch.  This provides configuration via the autoconf
system.

llvm-svn: 7014
diff --git a/llvm/lib/ExecutionEngine/Makefile b/llvm/lib/ExecutionEngine/Makefile
index 6ee2d3f..d74adf9 100644
--- a/llvm/lib/ExecutionEngine/Makefile
+++ b/llvm/lib/ExecutionEngine/Makefile
@@ -3,7 +3,7 @@
 PARALLEL_DIRS = Interpreter JIT
 
 # Get the config name...
-include $(LEVEL)/Makefile.$(shell uname)
+include $(LEVEL)/Makefile.config
 
 # Generic JIT libraries
 JITLIBS   = lli-jit codegen