* Get additional configured values into the makefiles

* Provide support for ENABLE_DOXYGEN
* New tools that documentation generation requires


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18326 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 54 insertions, 31 deletions

diff --git a/Makefile.config.in b/Makefile.config.in
index c9b9442885..aa36cda065 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -12,6 +12,21 @@
 #
 #===------------------------------------------------------------------------===#
 
+# Define LLVM speific info and directories
+PACKAGE_NAME      := @PACKAGE_NAME@
+PACKAGE_VERSION   := @PACKAGE_VERSION@
+LLVM_PREFIX       := @LLVM_PREFIX@
+LLVM_BINDIR       := @LLVM_BINDIR@
+LLVM_LIBDIR       := @LLVM_LIBDIR@
+LLVM_DATADIR      := @LLVM_DATADIR@
+LLVM_DOCSDIR      := @LLVM_DOCSDIR@
+LLVM_ETCDIR       := @LLVM_ETCDIR@
+LLVM_INCLUDEDIR   := @LLVM_INCLUDEDIR@
+LLVM_INFODIR      := @LLVM_INFODIR@
+LLVM_MANDIR       := @LLVM_MANDIR@
+LLVM_CONFIGTIME   := @LLVM_CONFIGTIME@
+LLVM_TARBALL_NAME := @PACKAGE_NAME@-@PACKAGE_VERSION@
+
 # Target operating system for which LLVM will be compiled.
 OS=@OS@
 
@@ -31,12 +46,6 @@ CXX = @CXX@
 # Path to the CC binary, which use used by testcases for native builds.
 CC := @CC@
 
-# Path to the Python interpreter
-PYTHON := @PYTHON@
-
-# Path to the Deja-Gnu runtest program
-RUNTEST := @RUNTEST@
-
 # Linker flags.
 LDFLAGS+=@LDFLAGS@
 
@@ -47,28 +56,42 @@ TOOLLINKOPTS=@LIBS@
 AR_PATH = @AR@
 
 # The pathnames of the programs we require to build
-YACC    = @YACC@
-BISON   = @BISON@
-FLEX    = @LEX@
-TAR     = @TAR@
-INSTALL = @INSTALL@
-DOT     = @DOT@
-ETAGS   = @ETAGS@
-ETAGSFLAGS = @ETAGSFLAGS@
+BISON      := @BISON@
+DATE       := @DATE@
+FIND       := @FIND@
+FLEX       := @LEX@
+GREP       := @GREP@
+INSTALL    := @INSTALL@
+INSTALL_SH := $(BUILD_SRC_ROOT)/autoconf/install-sh
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_DATA = @INSTALL_DATA@
+MKDIR      := @abs_top_srcdir@/autoconf/mkinstalldirs
+MV         := @MV@
+PAX        := @PAX@
+RANLIB     := @RANLIB@
+RM         := @RM@
+SED        := @SED@
+TAR        := @TAR@
+YACC       := @YACC@
+
+# Paths to miscellaneous programs we hope are present but might not be
+BZIP2      := @BZIP2@
+DOT        := @DOT@
+DOXYGEN    := @DOXYGEN@
+ETAGS      := @ETAGS@
+ETAGSFLAGS := @ETAGSFLAGS@
+GROFF      := @GROFF@
+GZIP       := @GZIP@
+POD2HTML   := @POD2HTML@
+POD2MAN    := @POD2MAN@
+PYTHON     := @PYTHON@
+RUNTEST    := @RUNTEST@
+ZIP        := @ZIP@
 
 # Paths to miscellaneous programs we assume are present
-RPWD    = pwd
-SED     = sed
-RM      = rm
-ECHO    = echo
-MKDIR   = @abs_top_srcdir@/autoconf/mkinstalldirs
-INSTALL_SH = $(BUILD_SRC_ROOT)/autoconf/install-sh
-DATE    = date
-MV      = mv
-GZIP    = gzip
-ZIP     = zip
-BZIP2   = bzip2
-
+RPWD       := pwd
+ECHO       := echo
 # Determine the target for which LLVM should generate code.
 LLVMGCCARCH := @target@/3.4-llvm
 
@@ -97,6 +120,9 @@ LLVMGCCDIR := @LLVMGCCDIR@
 # information to allow gprof to be used to get execution frequencies.
 #ENABLE_PROFILING = 1
 
+# When ENABLE_DOXYGEN is enabled, the doxygen documentation will be built
+ENABLE_DOXYGEN = @ENABLE_DOXYGEN@
+
 # This option tells the Makefiles to produce verbose output.
 # It essentially prints the commands that make is executing
 #VERBOSE = 1
@@ -162,6 +188,8 @@ LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
 endif
 
 # Installation directories, as provided by the configure script.
+abs_top_srcdir = @abs_top_srcdir@
+abs_top_builddir = @abs_top_builddir@
 exec_prefix = @exec_prefix@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -177,8 +205,3 @@ bytecode_libdir = $(LLVMGCCDIR)/bytecode-libs
 includedir = @includedir@
 infodir = @infodir@
 mandir = @mandir@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-LLVM_TARBALL_NAME = @PACKAGE_NAME@-@PACKAGE_VERSION@
-