yugui	2010-09-19 22:10:27 +0900 (Sun, 19 Sep 2010)

  New Revision: 29300

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29300

  Log:
    * configure.in (--disable-install-doc): disables capi too, in addition
      to rdoc.
      (--disable-install-rdoc): a new option for disabling only rdoc.
      (--disable-install-capi): a new option for disabling only capi.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 29299)
+++ configure.in	(revision 29300)
@@ -352,12 +352,6 @@
 
 AC_CHECK_TOOL(DOT, dot)
 AC_CHECK_TOOL(DOXYGEN, doxygen)
-if test x"$DOXYGEN" = x; then
-    CAPITARGET=nodoc
-else
-    CAPITARGET=capi
-fi
-AC_SUBST(CAPITARGET)
 
 # checks for UNIX variants that set C preprocessor variables
 AC_USE_SYSTEM_EXTENSIONS
@@ -2211,16 +2205,35 @@
 
 dnl build rdoc index if requested
 RDOCTARGET=""
+CAPITARGET=""
 AC_ARG_ENABLE(install-doc,
-       AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]),
+       AS_HELP_STRING([--disable-install-doc], [do not install neither rdoc indexes nor C API documents during install]),
        [install_doc=$enableval], [install_doc=yes])
+AC_ARG_ENABLE(install-rdoc,
+      AS_HELP_STRING([--disable-install-rdoc], [do not install rdoc indexes during install]),
+      [install_rdoc=$enableval], [install_rdoc=yes])
+AC_ARG_ENABLE(install-capi,
+      AS_HELP_STRING([--disable-install-capi], [do not install C API documents during install]),
+      [install_capi=$enableval], [install_capi=yes])
+
 if test "$install_doc" != no; then
-    RDOCTARGET="rdoc"
+    if test "$install_rdoc" != no; then
+	RDOCTARGET="rdoc"
+    else
+	RDOCTARGET="nodoc"
+    fi
+    if test "$install_capi" != no -a -n "$DOXYGEN"; then
+	CAPITARGET="capi"
+    else
+	CAPITARGET="nodoc"
+    fi
 else
     RDOCTARGET="nodoc"
     CAPITARGET="nodoc"
 fi
+
 AC_SUBST(RDOCTARGET)
+AC_SUBST(CAPITARGET)
 
 AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
 AC_SUBST(INSTALLDOC)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29299)
+++ ChangeLog	(revision 29300)
@@ -1,3 +1,10 @@
+Sun Sep 19 20:43:33 2010  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* configure.in (--disable-install-doc): disables capi too, in addition
+	  to rdoc.
+	  (--disable-install-rdoc): a new option for disabling only rdoc.
+	  (--disable-install-capi): a new option for disabling only capi.
+
 Sun Sep 19 20:37:45 2010  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* common.mk (clean): removes all documents on cleaning.o

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/