[llvm-commits] [llvm] r118918 - in /llvm/trunk: Makefile Makefile.config.in autoconf/configure.ac configure
Rafael Espindola
rafael.espindola at gmail.com
Fri Nov 12 11:24:06 PST 2010
Author: rafael
Date: Fri Nov 12 13:24:06 2010
New Revision: 118918
URL: http://llvm.org/viewvc/llvm-project?rev=118918&view=rev
Log:
Add --enable-docs. Patch by NAKAMURA Takumi.
Modified:
llvm/trunk/Makefile
llvm/trunk/Makefile.config.in
llvm/trunk/autoconf/configure.ac
llvm/trunk/configure
Modified: llvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=118918&r1=118917&r2=118918&view=diff
==============================================================================
--- llvm/trunk/Makefile (original)
+++ llvm/trunk/Makefile Fri Nov 12 13:24:06 2010
@@ -47,6 +47,10 @@
DIRS := $(filter-out tools/llvm-shlib, $(DIRS))
endif
+ifneq ($(ENABLE_DOCS),1)
+ DIRS := $(filter-out docs, $(DIRS))
+endif
+
ifeq ($(MAKECMDGOALS),libs-only)
DIRS := $(filter-out tools runtime docs, $(DIRS))
OPTIONAL_DIRS :=
Modified: llvm/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=118918&r1=118917&r2=118918&view=diff
==============================================================================
--- llvm/trunk/Makefile.config.in (original)
+++ llvm/trunk/Makefile.config.in Fri Nov 12 13:24:06 2010
@@ -264,6 +264,9 @@
# information to allow gprof to be used to get execution frequencies.
#ENABLE_PROFILING = 1
+# When ENABLE_DOCS is disabled, docs/ will not be built.
+ENABLE_DOCS = @ENABLE_DOCS@
+
# When ENABLE_DOXYGEN is enabled, the doxygen documentation will be built
ENABLE_DOXYGEN = @ENABLE_DOXYGEN@
Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=118918&r1=118917&r2=118918&view=diff
==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Fri Nov 12 13:24:06 2010
@@ -493,6 +493,18 @@
esac
fi
+dnl Allow enablement of building and installing docs
+AC_ARG_ENABLE(docs,
+ AS_HELP_STRING([--enable-docs],
+ [Build documents (default is YES)]),,
+ enableval=default)
+case "$enableval" in
+ yes) AC_SUBST(ENABLE_DOCS,[1]) ;;
+ no) AC_SUBST(ENABLE_DOCS,[0]) ;;
+ default) AC_SUBST(ENABLE_DOCS,[1]) ;;
+ *) AC_MSG_ERROR([Invalid setting for --enable-docs. Use "yes" or "no"]) ;;
+esac
+
dnl Allow enablement of doxygen generated documentation
AC_ARG_ENABLE(doxygen,
AS_HELP_STRING([--enable-doxygen],
Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=118918&r1=118917&r2=118918&view=diff
==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Fri Nov 12 13:24:06 2010
@@ -688,6 +688,7 @@
DEBUG_SYMBOLS
JIT
TARGET_HAS_JIT
+ENABLE_DOCS
ENABLE_DOXYGEN
ENABLE_THREADS
ENABLE_PIC
@@ -1411,6 +1412,7 @@
--enable-debug-symbols Build compiler with debug symbols (default is NO if
optimization is on and YES if it's off)
--enable-jit Enable Just In Time Compiling (default is YES)
+ --enable-docs Build documents (default is YES)
--enable-doxygen Build doxygen documentation (default is NO)
--enable-threads Use threads if available (default is YES)
--enable-pic Build LLVM with Position Independent Code (default
@@ -4871,6 +4873,25 @@
esac
fi
+# Check whether --enable-docs was given.
+if test "${enable_docs+set}" = set; then
+ enableval=$enable_docs;
+else
+ enableval=default
+fi
+
+case "$enableval" in
+ yes) ENABLE_DOCS=1
+ ;;
+ no) ENABLE_DOCS=0
+ ;;
+ default) ENABLE_DOCS=1
+ ;;
+ *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-docs. Use \"yes\" or \"no\"" >&5
+echo "$as_me: error: Invalid setting for --enable-docs. Use \"yes\" or \"no\"" >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+
# Check whether --enable-doxygen was given.
if test "${enable_doxygen+set}" = set; then
enableval=$enable_doxygen;
@@ -11501,7 +11522,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11504 "configure"
+#line 11525 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -21697,6 +21718,7 @@
DEBUG_SYMBOLS!$DEBUG_SYMBOLS$ac_delim
JIT!$JIT$ac_delim
TARGET_HAS_JIT!$TARGET_HAS_JIT$ac_delim
+ENABLE_DOCS!$ENABLE_DOCS$ac_delim
ENABLE_DOXYGEN!$ENABLE_DOXYGEN$ac_delim
ENABLE_THREADS!$ENABLE_THREADS$ac_delim
ENABLE_PIC!$ENABLE_PIC$ac_delim
@@ -21707,7 +21729,6 @@
LLVM_ENUM_ASM_PRINTERS!$LLVM_ENUM_ASM_PRINTERS$ac_delim
LLVM_ENUM_ASM_PARSERS!$LLVM_ENUM_ASM_PARSERS$ac_delim
LLVM_ENUM_DISASSEMBLERS!$LLVM_ENUM_DISASSEMBLERS$ac_delim
-ENABLE_CBE_PRINTF_A!$ENABLE_CBE_PRINTF_A$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -21749,6 +21770,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+ENABLE_CBE_PRINTF_A!$ENABLE_CBE_PRINTF_A$ac_delim
CLANGPATH!$CLANGPATH$ac_delim
CLANGXXPATH!$CLANGXXPATH$ac_delim
ENABLE_BUILT_CLANG!$ENABLE_BUILT_CLANG$ac_delim
@@ -21845,7 +21867,6 @@
OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
RPATH!$RPATH$ac_delim
-RDYNAMIC!$RDYNAMIC$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -21887,11 +21908,12 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+RDYNAMIC!$RDYNAMIC$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
More information about the llvm-commits
mailing list