Allow unix:<screen> style display names again.

[free-sw/xcb/libxcb] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 27fda42..8b240ad 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -44,12 +44,16 @@ 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"
         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,16 +97,13 @@ 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
     dnl Substitution
     dnl
     AC_SUBST([DOXYGEN])
-    dnl according to the autoconf doc, htmldir == docdir == ${prefix}/share/doc/${PACKAGE_NAME}
-    dnl I tried to use docdir, without success
-    htmldir=${prefix}/share/doc/${PACKAGE_NAME}
-    AC_SUBST(htmldir)
     AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes")
    ])
 dnl End of acinclude.m4