From 7be3a60617004638513e1db5d5bc435773967afd Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Fri, 13 May 2011 03:27:56 +0000 Subject: Re-add the autoconf rule for the docs/doxygen.cfg file. For some reason this was not reverted when r103213 was. At the same time, add an optional rule for clang's doxygen.cfg. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131279 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/configure.ac | 6 ++++++ configure | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index b55f56444f..6b5efbeaeb 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1723,6 +1723,12 @@ AC_CONFIG_FILES([Makefile.config]) dnl Configure the RPM spec file for LLVM AC_CONFIG_FILES([llvm.spec]) +dnl Configure doxygen's configuration file +AC_CONFIG_FILES([docs/doxygen.cfg]) +if test -f ${srcdir}/tools/clang/README.txt; then + AC_CONFIG_FILES([tools/clang/docs/doxygen.cfg]) +fi + dnl Configure llvmc's Base plugin AC_CONFIG_FILES([tools/llvmc/src/Base.td]) diff --git a/configure b/configure index f1f4dd3c77..20dc65ebc1 100755 --- a/configure +++ b/configure @@ -22574,6 +22574,13 @@ ac_config_files="$ac_config_files Makefile.config" ac_config_files="$ac_config_files llvm.spec" +ac_config_files="$ac_config_files docs/doxygen.cfg" + +if test -f ${srcdir}/tools/clang/README.txt; then + ac_config_files="$ac_config_files tools/clang/docs/doxygen.cfg" + +fi + ac_config_files="$ac_config_files tools/llvmc/src/Base.td" @@ -23194,6 +23201,8 @@ do "include/llvm/Support/DataTypes.h") CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/Support/DataTypes.h" ;; "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; "llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;; + "docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;; + "tools/clang/docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES tools/clang/docs/doxygen.cfg" ;; "tools/llvmc/src/Base.td") CONFIG_FILES="$CONFIG_FILES tools/llvmc/src/Base.td" ;; "tools/llvm-config/llvm-config.in") CONFIG_FILES="$CONFIG_FILES tools/llvm-config/llvm-config.in" ;; "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;; -- cgit v1.2.3