New upstream version 1.2.8

1 files changed, 49 insertions, 434 deletions

diff --git a/configure b/configure
index b23a0be..1ec7ea1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dbus-python 1.2.6.
+# Generated by GNU Autoconf 2.69 for dbus-python 1.2.8.
 #
 # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=python>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dbus-python'
 PACKAGE_TARNAME='dbus-python'
-PACKAGE_VERSION='1.2.6'
-PACKAGE_STRING='dbus-python 1.2.6'
+PACKAGE_VERSION='1.2.8'
+PACKAGE_STRING='dbus-python 1.2.8'
 PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=python'
 PACKAGE_URL=''
 
@@ -647,14 +647,9 @@ DBUS_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-ENABLE_DOCS_FALSE
-ENABLE_DOCS_TRUE
-ENABLE_API_DOCS_FALSE
-ENABLE_API_DOCS_TRUE
-RST2HTMLFLAGS
-RST2HTML
+ENABLE_DOCUMENTATION_FALSE
+ENABLE_DOCUMENTATION_TRUE
 DBUS_RUN_SESSION
-EPYDOC
 GENERATE_CHANGELOG_RULES
 GIT
 ENABLE_INSTALLED_TESTS_FALSE
@@ -814,8 +809,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_installed_tests
-enable_html_docs
-enable_api_docs
+enable_documentation
 enable_compile_warnings
 enable_Werror
 enable_coding_style_checks
@@ -1395,7 +1389,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dbus-python 1.2.6 to adapt to many kinds of systems.
+\`configure' configures dbus-python 1.2.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1466,7 +1460,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dbus-python 1.2.6:";;
+     short | recursive ) echo "Configuration of dbus-python 1.2.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1491,10 +1485,8 @@ Optional Features:
   --enable-installed tests
                           install test programs and helpers for as-installed
                           testing
-  --enable-html-docs      Enable HTML documentation building (requires
-                          docutils, default: auto-detect)
-  --enable-api-docs       Enable API documentation building (requires epydoc 3
-                          and docutils)
+  --enable-documentation  Enable documentation building (requires sphinx and
+                          sphinx_rtd_theme)
   --enable-compile-warnings=[no/yes/error]
                           Enable compiler warnings and errors
   --disable-Werror        Unconditionally make all compiler warnings non-fatal
@@ -1620,7 +1612,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dbus-python configure 1.2.6
+dbus-python configure 1.2.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1989,7 +1981,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dbus-python $as_me 1.2.6, which was
+It was created by dbus-python $as_me 1.2.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2460,9 +2452,9 @@ $as_echo "#define DBUS_PYTHON_MINOR_VERSION 2" >>confdefs.h
 DBUS_PYTHON_MINOR_VERSION=2
 
 
-$as_echo "#define DBUS_PYTHON_MICRO_VERSION 6" >>confdefs.h
+$as_echo "#define DBUS_PYTHON_MICRO_VERSION 8" >>confdefs.h
 
-DBUS_PYTHON_MICRO_VERSION=6
+DBUS_PYTHON_MICRO_VERSION=8
 
 
 
@@ -4286,7 +4278,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dbus-python'
- VERSION='1.2.6'
+ VERSION='1.2.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13108,33 +13100,13 @@ dist-ChangeLog:
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you want to build HTML docs" >&5
-$as_echo_n "checking whether you want to build HTML docs... " >&6; }
-# Check whether --enable-html-docs was given.
-if test "${enable_html_docs+set}" = set; then :
-  enableval=$enable_html_docs; enable_html_docs=$enableval
+# Check whether --enable-documentation was given.
+if test "${enable_documentation+set}" = set; then :
+  enableval=$enable_documentation; :
 else
-  enable_html_docs="if possible"
+  enable_documentation=auto
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_html_docs" >&5
-$as_echo "$enable_html_docs" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you want to build API docs" >&5
-$as_echo_n "checking whether you want to build API docs... " >&6; }
-# Check whether --enable-api-docs was given.
-if test "${enable_api_docs+set}" = set; then :
-  enableval=$enable_api_docs; enable_api_docs=$enableval
-else
-  enable_api_docs="if possible"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_api_docs" >&5
-$as_echo "$enable_api_docs" >&6; }
-
-
-if test "$enable_api_docs" != no || test "$enable_html_docs" != no; then :
-
 
     if test -z $PYTHON;
     then
@@ -13146,84 +13118,35 @@ if test "$enable_api_docs" != no || test "$enable_html_docs" != no; then :
         fi
     fi
     PYTHON_NAME=`basename $PYTHON`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: docutils" >&5
-$as_echo_n "checking $PYTHON_NAME module: docutils... " >&6; }
-    $PYTHON -c "import docutils" 2>/dev/null
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: sphinx" >&5
+$as_echo_n "checking $PYTHON_NAME module: sphinx... " >&6; }
+    $PYTHON -c "import sphinx" 2>/dev/null
     if test $? -eq 0;
     then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        eval HAVE_PYMOD_DOCUTILS=yes
+        eval HAVE_PYMOD_SPHINX=yes
     else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-        eval HAVE_PYMOD_DOCUTILS=no
+        eval HAVE_PYMOD_SPHINX=no
         #
         if test -n ""
         then
-            as_fn_error $? "failed to find required module docutils" "$LINENO" 5
+            as_fn_error $? "failed to find required module sphinx" "$LINENO" 5
             exit 1
         fi
     fi
 
-  if test "$HAVE_PYMOD_DOCUTILS" = no; then :
+if test "x$HAVE_PYMOD_SPHINX" = xno; then :
 
-    if test "$enable_api_docs" = "if possible"; then :
-  enable_api_docs=no
-fi
-    if test "$enable_html_docs" = "if possible"; then :
-  enable_html_docs=no
-fi
-    if test "$enable_api_docs" != no || test "$enable_html_docs" != no; then :
-  as_fn_error $? "cannot compile HTML documentation or API documentation without python-docutils installed" "$LINENO" 5
-fi
-
-fi
-
-fi
-
-if test "${enable_api_docs}" != no; then :
-
-  # Extract the first word of "epydoc", so it can be a program name with args.
-set dummy epydoc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_EPYDOC+:} false; then :
-  $as_echo_n "(cached) " >&6
+  if test "$enable_documentation" = yes; then :
+  as_fn_error $? "cannot build documentation without sphinx Python module" "$LINENO" 5
 else
-  case $EPYDOC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_EPYDOC="$EPYDOC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_EPYDOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-EPYDOC=$ac_cv_path_EPYDOC
-if test -n "$EPYDOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPYDOC" >&5
-$as_echo "$EPYDOC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  enable_documentation=no
 fi
 
-
+fi
 
     if test -z $PYTHON;
     then
@@ -13235,63 +13158,32 @@ fi
         fi
     fi
     PYTHON_NAME=`basename $PYTHON`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: epydoc" >&5
-$as_echo_n "checking $PYTHON_NAME module: epydoc... " >&6; }
-    $PYTHON -c "import epydoc" 2>/dev/null
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: sphinx_rtd_theme" >&5
+$as_echo_n "checking $PYTHON_NAME module: sphinx_rtd_theme... " >&6; }
+    $PYTHON -c "import sphinx_rtd_theme" 2>/dev/null
     if test $? -eq 0;
     then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        eval HAVE_PYMOD_EPYDOC=yes
+        eval HAVE_PYMOD_SPHINX_RTD_THEME=yes
     else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-        eval HAVE_PYMOD_EPYDOC=no
+        eval HAVE_PYMOD_SPHINX_RTD_THEME=no
         #
         if test -n ""
         then
-            as_fn_error $? "failed to find required module epydoc" "$LINENO" 5
+            as_fn_error $? "failed to find required module sphinx_rtd_theme" "$LINENO" 5
             exit 1
         fi
     fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking epydoc 3" >&5
-$as_echo_n "checking epydoc 3... " >&6; }
-  if test -n "$EPYDOC" && test "$HAVE_PYMOD_EPYDOC" = yes; then :
-
-    EPYDOC_VERSION=`$EPYDOC --version`
-    case "$EPYDOC_VERSION" in #(
-  *ersion?3*) :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $EPYDOC_VERSION" >&5
-$as_echo "yes, $EPYDOC_VERSION" >&6; }
-         ;; #(
-  *) :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, $EPYDOC_VERSION" >&5
-$as_echo "no, $EPYDOC_VERSION" >&6; }
-        EPYDOC=
-         ;; #(
-  *) :
-     ;;
-esac
+if test "x$HAVE_PYMOD_SPHINX_RTD_THEME" = xno; then :
 
+  if test "$enable_documentation" = yes; then :
+  as_fn_error $? "cannot build documentation without sphinx_rtd_theme Python module" "$LINENO" 5
 else
-
-    EPYDOC=
-
-fi
-  if test -z "$EPYDOC"; then :
-
-    case "$enable_api_docs" in #(
-  if*possible) :
-    enable_api_docs=no ;; #(
-  *) :
-    as_fn_error $? "cannot compile API documentation without epydoc 3.0beta1 or newer installed" "$LINENO" 5 ;; #(
-  *) :
-     ;;
-esac
-
+  enable_documentation=no
 fi
 
 fi
@@ -13339,285 +13231,12 @@ fi
 
 
 
-RST2HTMLFLAGS=
-if test "${enable_html_docs}" != no; then :
-
-  for ac_prog in rst2html rst2html.py
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RST2HTML+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RST2HTML"; then
-  ac_cv_prog_RST2HTML="$RST2HTML" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RST2HTML="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RST2HTML=$ac_cv_prog_RST2HTML
-if test -n "$RST2HTML"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RST2HTML" >&5
-$as_echo "$RST2HTML" >&6; }
+ if test "$enable_documentation" != no; then
+  ENABLE_DOCUMENTATION_TRUE=
+  ENABLE_DOCUMENTATION_FALSE='#'
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$RST2HTML" && break
-done
-
-  if test -z "$RST2HTML"; then :
-
-    case "$enable_html_docs" in #(
-  if*possible) :
-    enable_html_docs=no ;; #(
-  *) :
-    as_fn_error $? "cannot compile HTML documentation without rst2html installed" "$LINENO" 5 ;; #(
-  *) :
-     ;;
-esac
-
-fi
-
-else
-
-
-case " $RST2HTMLFLAGS " in #(
-  *[\	\ ]--generator[\	\ ]*) :
-     ;; #(
-  *) :
-
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS --generator"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $RST2HTML understands --generator" >&5
-$as_echo_n "checking whether $RST2HTML understands --generator... " >&6; }
-  if $RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null; then :
-  dbuspy_has_option=yes
-else
-  dbuspy_has_option=no
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dbuspy_has_option" >&5
-$as_echo "$dbuspy_has_option" >&6; }
-  if test $dbuspy_has_option = no; then :
-  RST2HTMLFLAGS="$save_RST2HTMLFLAGS"
-fi
-   ;; #(
-  *) :
-     ;;
-esac
-
-
-case " $RST2HTMLFLAGS " in #(
-  *[\	\ ]--date[\	\ ]*) :
-     ;; #(
-  *) :
-
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS --date"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $RST2HTML understands --date" >&5
-$as_echo_n "checking whether $RST2HTML understands --date... " >&6; }
-  if $RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null; then :
-  dbuspy_has_option=yes
-else
-  dbuspy_has_option=no
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dbuspy_has_option" >&5
-$as_echo "$dbuspy_has_option" >&6; }
-  if test $dbuspy_has_option = no; then :
-  RST2HTMLFLAGS="$save_RST2HTMLFLAGS"
-fi
-   ;; #(
-  *) :
-     ;;
-esac
-
-
-case " $RST2HTMLFLAGS " in #(
-  *[\	\ ]--time[\	\ ]*) :
-     ;; #(
-  *) :
-
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS --time"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $RST2HTML understands --time" >&5
-$as_echo_n "checking whether $RST2HTML understands --time... " >&6; }
-  if $RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null; then :
-  dbuspy_has_option=yes
-else
-  dbuspy_has_option=no
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dbuspy_has_option" >&5
-$as_echo "$dbuspy_has_option" >&6; }
-  if test $dbuspy_has_option = no; then :
-  RST2HTMLFLAGS="$save_RST2HTMLFLAGS"
-fi
-   ;; #(
-  *) :
-     ;;
-esac
-
-
-case " $RST2HTMLFLAGS " in #(
-  *[\	\ ]--exit-status=2[\	\ ]*) :
-     ;; #(
-  *) :
-
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS --exit-status=2"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $RST2HTML understands --exit-status=2" >&5
-$as_echo_n "checking whether $RST2HTML understands --exit-status=2... " >&6; }
-  if $RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null; then :
-  dbuspy_has_option=yes
-else
-  dbuspy_has_option=no
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dbuspy_has_option" >&5
-$as_echo "$dbuspy_has_option" >&6; }
-  if test $dbuspy_has_option = no; then :
-  RST2HTMLFLAGS="$save_RST2HTMLFLAGS"
-fi
-   ;; #(
-  *) :
-     ;;
-esac
-
-
-case " $RST2HTMLFLAGS " in #(
-  *[\	\ ]--no-raw[\	\ ]*) :
-     ;; #(
-  *) :
-
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS --no-raw"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $RST2HTML understands --no-raw" >&5
-$as_echo_n "checking whether $RST2HTML understands --no-raw... " >&6; }
-  if $RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null; then :
-  dbuspy_has_option=yes
-else
-  dbuspy_has_option=no
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dbuspy_has_option" >&5
-$as_echo "$dbuspy_has_option" >&6; }
-  if test $dbuspy_has_option = no; then :
-  RST2HTMLFLAGS="$save_RST2HTMLFLAGS"
-fi
-   ;; #(
-  *) :
-     ;;
-esac
-
-
-case " $RST2HTMLFLAGS " in #(
-  *[\	\ ]--no-file-insertion[\	\ ]*) :
-     ;; #(
-  *) :
-
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS --no-file-insertion"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $RST2HTML understands --no-file-insertion" >&5
-$as_echo_n "checking whether $RST2HTML understands --no-file-insertion... " >&6; }
-  if $RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null; then :
-  dbuspy_has_option=yes
-else
-  dbuspy_has_option=no
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dbuspy_has_option" >&5
-$as_echo "$dbuspy_has_option" >&6; }
-  if test $dbuspy_has_option = no; then :
-  RST2HTMLFLAGS="$save_RST2HTMLFLAGS"
-fi
-   ;; #(
-  *) :
-     ;;
-esac
-
-
-case " $RST2HTMLFLAGS " in #(
-  *[\	\ ]--cloak-email-addresses[\	\ ]*) :
-     ;; #(
-  *) :
-
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS --cloak-email-addresses"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $RST2HTML understands --cloak-email-addresses" >&5
-$as_echo_n "checking whether $RST2HTML understands --cloak-email-addresses... " >&6; }
-  if $RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null; then :
-  dbuspy_has_option=yes
-else
-  dbuspy_has_option=no
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dbuspy_has_option" >&5
-$as_echo "$dbuspy_has_option" >&6; }
-  if test $dbuspy_has_option = no; then :
-  RST2HTMLFLAGS="$save_RST2HTMLFLAGS"
-fi
-   ;; #(
-  *) :
-     ;;
-esac
-
-
-case " $RST2HTMLFLAGS " in #(
-  *[\	\ ]--input-encoding=UTF-8[\	\ ]*) :
-     ;; #(
-  *) :
-
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS --input-encoding=UTF-8"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $RST2HTML understands --input-encoding=UTF-8" >&5
-$as_echo_n "checking whether $RST2HTML understands --input-encoding=UTF-8... " >&6; }
-  if $RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null; then :
-  dbuspy_has_option=yes
-else
-  dbuspy_has_option=no
-fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dbuspy_has_option" >&5
-$as_echo "$dbuspy_has_option" >&6; }
-  if test $dbuspy_has_option = no; then :
-  RST2HTMLFLAGS="$save_RST2HTMLFLAGS"
-fi
-   ;; #(
-  *) :
-     ;;
-esac
-
-
-fi
-
-
-
- if test "$enable_api_docs" != no; then
-  ENABLE_API_DOCS_TRUE=
-  ENABLE_API_DOCS_FALSE='#'
-else
-  ENABLE_API_DOCS_TRUE='#'
-  ENABLE_API_DOCS_FALSE=
-fi
-
- if test "$enable_html_docs" != no; then
-  ENABLE_DOCS_TRUE=
-  ENABLE_DOCS_FALSE='#'
-else
-  ENABLE_DOCS_TRUE='#'
-  ENABLE_DOCS_FALSE=
+  ENABLE_DOCUMENTATION_TRUE='#'
+  ENABLE_DOCUMENTATION_FALSE=
 fi
 
 
@@ -15172,12 +14791,8 @@ if test -z "${ENABLE_INSTALLED_TESTS_TRUE}" && test -z "${ENABLE_INSTALLED_TESTS
   as_fn_error $? "conditional \"ENABLE_INSTALLED_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_API_DOCS_TRUE}" && test -z "${ENABLE_API_DOCS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_API_DOCS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_DOCS\" was never defined.
+if test -z "${ENABLE_DOCUMENTATION_TRUE}" && test -z "${ENABLE_DOCUMENTATION_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_DOCUMENTATION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -15577,7 +15192,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dbus-python $as_me 1.2.6, which was
+This file was extended by dbus-python $as_me 1.2.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15643,7 +15258,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dbus-python config.status 1.2.6
+dbus-python config.status 1.2.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"