Revert "sphinx: add --with-sphinx-build"

This reverts commit 1f5a932e89b0c2c4a7af7f849ca2e2e3dbf329e0.

3 files changed, 6 insertions, 97 deletions

diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index d551f56ce62..259ef2a5f4b 100644
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -346,7 +346,6 @@ REPORT_BUGS_TO = @REPORT_BUGS_TO@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SPHINX_BUILD = @SPHINX_BUILD@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XCFLAGS = @XCFLAGS@
@@ -951,10 +950,10 @@ distclean-libtool:
 	-rm -f libtool config.lt
 
 doc/pdf/latex/libquadmath.pdf: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf SPHINXBUILD=$(SPHINX_BUILD)
+	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf
 
 doc/html/html/index.html: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html SPHINXBUILD=$(SPHINX_BUILD)
+	+ make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html
 
 uninstall-html-am:
 	@$(NORMAL_UNINSTALL)
@@ -1374,7 +1373,7 @@ SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
 export BUGURL=$(REPORT_BUGS_TO)
 
 doc/info/texinfo/libquadmath.info: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
+	+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info
 
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the
diff --git a/libquadmath/configure b/libquadmath/configure
index b7928de4ef4..958fb876c5b 100755
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -633,9 +633,6 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 get_gcc_base_ver
-HAS_SPHINX_BUILD
-SPHINX_BUILD
-CONFIGURE_SPHINX_BUILD
 GENINSRC_FALSE
 GENINSRC_TRUE
 XCFLAGS
@@ -793,7 +790,6 @@ with_toolexeclibdir
 enable_symvers
 enable_cet
 enable_generated_files_in_srcdir
-with_sphinx_build
 with_gcc_major_version_only
 '
       ac_precious_vars='build_alias
@@ -1459,7 +1455,6 @@ Optional Packages:
   --with-toolexeclibdir=DIR
                           install libraries built with a cross compiler within
                           DIR
-  --with-sphinx-build=    Use sphinx-build from a given path
   --with-gcc-major-version-only
                           use only GCC major number in filesystem paths
 
@@ -4698,7 +4693,7 @@ fi
     REPORT_BUGS_TEXI=
     ;;
   *)
-    REPORT_BUGS_TO="$BUGURL"
+    REPORT_BUGS_TO="<$BUGURL>"
     REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`}
     ;;
   esac;
@@ -10835,7 +10830,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10838 "configure"
+#line 10833 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10941,7 +10936,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10944 "configure"
+#line 10939 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13272,53 +13267,6 @@ else
 fi
 
 
-
-# Check whether --with-sphinx-build was given.
-if test "${with_sphinx_build+set}" = set; then :
-  withval=$with_sphinx_build; CONFIGURE_SPHINX_BUILD=$withval
-else
-  CONFIGURE_SPHINX_BUILD=
-
-fi
-
-
-
-# See if sphinx-build has been installed and is modern enough
-# that we can use it.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sphinx-build" >&5
-$as_echo_n "checking for sphinx-build... " >&6; }
-sphinx=sphinx-build
-if test x${CONFIGURE_SPHINX_BUILD} != x ; then
-  sphinx=${CONFIGURE_SPHINX_BUILD}
-fi
-
-tempdir=build.$$
-source=source.$$
-mkdir $source
-grep 'needs_sphinx =' ${srcdir}/../doc/baseconf.py > $source/conf.py
-touch $source/index.rst
-if ${sphinx} $source $tempdir >/dev/null 2>&1; then
-  SPHINX_BUILD=${sphinx}
-  HAS_SPHINX_BUILD=has-sphinx-build
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-  *** sphinx-build is missing or too old.
-  *** Info and man pages documentation will not be built." >&5
-$as_echo "$as_me: WARNING:
-  *** sphinx-build is missing or too old.
-  *** Info and man pages documentation will not be built." >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SPHINX_BUILD=
-  HAS_SPHINX_BUILD=
-fi
-rm -rf $tempdir
-rm -rf $source
-
-
-
 # Determine what GCC version number to use in filesystem paths.
 
   get_gcc_base_ver="cat"
diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac
index f2befdcb16e..eec4084a45f 100644
--- a/libquadmath/configure.ac
+++ b/libquadmath/configure.ac
@@ -394,44 +394,6 @@ AS_HELP_STRING([--enable-generated-files-in-srcdir],
 AC_MSG_RESULT($enable_generated_files_in_srcdir)
 AM_CONDITIONAL(GENINSRC, test "$enable_generated_files_in_srcdir" = yes)
 
-AC_ARG_WITH(sphinx-build,
-  [AS_HELP_STRING([--with-sphinx-build=],
-                  [Use sphinx-build from a given path])],
-  [CONFIGURE_SPHINX_BUILD=$withval],
-  [CONFIGURE_SPHINX_BUILD=]
-)
-AC_SUBST(CONFIGURE_SPHINX_BUILD)
-
-# See if sphinx-build has been installed and is modern enough
-# that we can use it.
-AC_MSG_CHECKING([for sphinx-build])
-sphinx=sphinx-build
-if test x${CONFIGURE_SPHINX_BUILD} != x ; then
-  sphinx=${CONFIGURE_SPHINX_BUILD}
-fi
-
-tempdir=build.$$
-source=source.$$
-mkdir $source
-grep 'needs_sphinx =' ${srcdir}/../doc/baseconf.py > $source/conf.py
-touch $source/index.rst
-if ${sphinx} $source $tempdir >/dev/null 2>&1; then
-  SPHINX_BUILD=${sphinx}
-  HAS_SPHINX_BUILD=has-sphinx-build
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_WARN([
-  *** sphinx-build is missing or too old.
-  *** Info and man pages documentation will not be built.])
-  AC_MSG_RESULT(no)
-  SPHINX_BUILD=
-  HAS_SPHINX_BUILD=
-fi
-rm -rf $tempdir
-rm -rf $source
-AC_SUBST(SPHINX_BUILD)
-AC_SUBST(HAS_SPHINX_BUILD)
-
 # Determine what GCC version number to use in filesystem paths.
 GCC_BASE_VER