2009-05-24 Miguel de Icaza <miguel@novell.com>

	* Disable mono/docs build if we disabled the mcs build.

svn path=/trunk/mono/; revision=134651

diff --git a/ChangeLog b/ChangeLog
index a4d96252b1a50f196a70888420e6b7c43c8749cc..3658d7d08285d0596e8cce2b19784397c796f27e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-24  Miguel de Icaza  <miguel@novell.com>
+
+       * Disable mono/docs build if we disabled the mcs build.
+
 2009-05-24  Zoltan Varga  <vargaz@gmail.com>
 
        * */CMakeLists.txt: Add beginnings of a cmake based build system.

diff --git a/configure.in b/configure.in
index 76744f8c1ae8962e00b6756c8d205ace69a98ef2..ede58922a07de8c6c27f3f0a58b4da144bfe82a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2291,6 +2291,17 @@ AC_ARG_WITH(mcs_docs,[  --with-mcs-docs=yes,no         If you want to build the
        fi
 ])
 
+dnl
+dnl Consistency settings
+dnl
+if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
+   DISABLE_MCS_DOCS=yes
+   docs_dir=""
+else
+   docs_dir=docs
+fi
+AC_SUBST(docs_dir)
+
 AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
 AC_SUBST(OPROFILE_CFLAGS)
 AC_SUBST(OPROFILE_LIBS)
@@ -2514,13 +2525,6 @@ if test x$platform_win32 = xyes; then
    sed -e "s,-mno-cygwin,,g" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
 fi
 
-dnl
-dnl Consistency settings
-dnl
-if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
-   DISABLE_MCS_DOCS=yes
-fi
-
 (
   case $prefix in
   NONE) prefix=$ac_default_prefix ;;