From b779e6bf0b7cf03a96bc68a31be7d39ca383f645 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Sun, 13 Nov 2022 21:59:03 +0100 Subject: Revert "sphinx: add --with-sphinx-build" This reverts commit 1f5a932e89b0c2c4a7af7f849ca2e2e3dbf329e0. --- libitm/Makefile.in | 7 +++---- libitm/configure | 56 ++--------------------------------------------------- libitm/configure.ac | 38 ------------------------------------ 3 files changed, 5 insertions(+), 96 deletions(-) (limited to 'libitm') diff --git a/libitm/Makefile.in b/libitm/Makefile.in index 38a7e5b..d2f34b0 100644 --- a/libitm/Makefile.in +++ b/libitm/Makefile.in @@ -346,7 +346,6 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SPHINX_BUILD = @SPHINX_BUILD@ STRIP = @STRIP@ VERSION = @VERSION@ XCFLAGS = @XCFLAGS@ @@ -643,10 +642,10 @@ distclean-libtool: -rm -f libtool config.lt doc/pdf/latex/libitm.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) @@ -1121,7 +1120,7 @@ stamp-geninsrc: doc/info/texinfo/libitm.info @touch $@ doc/info/texinfo/libitm.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/libitm/configure b/libitm/configure index 20f2003..6230c04 100755 --- a/libitm/configure +++ b/libitm/configure @@ -633,9 +633,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS get_gcc_base_ver -HAS_SPHINX_BUILD -SPHINX_BUILD -CONFIGURE_SPHINX_BUILD ARCH_FUTEX_FALSE ARCH_FUTEX_TRUE ARCH_X86_AVX_FALSE @@ -819,7 +816,6 @@ enable_tls enable_symvers enable_werror enable_cet -with_sphinx_build with_gcc_major_version_only ' ac_precious_vars='build_alias @@ -1485,7 +1481,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sphinx-build= Use sphinx-build from a given path --with-gcc-major-version-only use only GCC major number in filesystem paths @@ -12087,7 +12082,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12090 "configure" +#line 12085 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12193,7 +12188,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12196 "configure" +#line 12191 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18055,53 +18050,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/libitm/configure.ac b/libitm/configure.ac index 6930f5a..78a6823 100644 --- a/libitm/configure.ac +++ b/libitm/configure.ac @@ -301,44 +301,6 @@ AM_CONDITIONAL([ARCH_X86], [test "$ARCH" = x86]) AM_CONDITIONAL([ARCH_X86_AVX], [test "$libitm_cv_as_avx" = yes]) AM_CONDITIONAL([ARCH_FUTEX], [test $enable_linux_futex = 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 -- cgit v1.1