[Xcb-commit] 2 commits - acinclude.m4

[Jamey Sharp]

 acinclude.m4 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

New commits:
diff-tree f486075fa093846c3f32b3e4b9624c039ea26ba4 (from 2e8e6debac39864450c0a69633086ad92459c25e)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Fri Nov 24 15:48:08 2006 +0100

    If enable_build_docs is "no", we don't even try to look for doxygen.
    
    Also set BUILD_DOCS in that branch. Now the disable-build-docs works
    as expected.

diff --git a/acinclude.m4 b/acinclude.m4
index e85ea5a..8b240ad 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -50,6 +50,10 @@ AC_DEFUN([AM_CHECK_DOXYGEN],
            enable_build_docs="yes"
         fi],
        [enable_build_docs="yes"])
+
+    if test "$enable_build_docs" = "no" ; then
+        BUILD_DOCS=no
+    else
     dnl
     dnl Get the prefix where doxygen is installed.
     dnl
@@ -93,6 +97,7 @@ AC_DEFUN([AM_CHECK_DOXYGEN],
            AC_MSG_WARN(
               [Warning: no doxygen detected. Documentation will not be built])
         fi])
+    fi
     AC_MSG_CHECKING([whether documentation is built])
     AC_MSG_RESULT([${BUILD_DOCS}])
     dnl
diff-tree 2e8e6debac39864450c0a69633086ad92459c25e (from 19dfaf93ac1b5e9d3ce09b1f8e2338e53a5d7324)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Fri Nov 24 15:43:39 2006 +0100

    Fixed evaluation of the disable-build-docs argument.
    
    Now at least enable_build_docs is set correctly.

diff --git a/acinclude.m4 b/acinclude.m4
index 186873c..e85ea5a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -44,7 +44,7 @@ AC_DEFUN([AM_CHECK_DOXYGEN],
        AC_HELP_STRING(
           [--disable-build-docs],
           [Disable the build of the documentation]),
-       [if test "${disable_build_docs}" = "yes" ; then
+       [if test x"$enableval" != x"yes" ; then
            enable_build_docs="no"
         else
            enable_build_docs="yes"