File do-not-use-sphinx.diff of Package xapian-bindings

Overview Repositories Revisions Requests Users Attributes Meta

File do-not-use-sphinx.diff of Package xapian-bindings (Revision 9c24c843340f1686086ca91a9c453e97)

Currently displaying revision 9c24c843340f1686086ca91a9c453e97 , Show latest

Index: xapian-bindings-1.4.20/configure
===================================================================
--- xapian-bindings-1.4.20.orig/configure
+++ xapian-bindings-1.4.20/configure
@@ -18076,19 +18076,6 @@ printf "%s\n" "$as_me: WARNING: Couldn't
 	fi
       fi
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python2 sphinx module" >&5
-printf %s "checking for python2 sphinx module... " >&6; }
-    if $PYTHON2 -c 'import sphinx;print(repr(sphinx.main))' >&5 2>&5 ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-    else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-      if test yes = "$with_python" ; then
-	as_fn_error $? "Couldn't import sphinx module and call sphinx.main() for Python2 - try package python-sphinx" "$LINENO" 5
-      fi
-      PYTHON2=
-    fi
     if test -n "$PYTHON2" ; then
                   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PYTHON2_INC/Python.h" >&5
 printf %s "checking for $PYTHON2_INC/Python.h... " >&6; }
@@ -18263,19 +18250,6 @@ printf "%s\n" "$version (too old)" >&6;
       PYTHON3_INC=`$PYTHON3 -c 'import os,sysconfig;print(sysconfig.get_path("include").replace(os.sep,"/"))' 2>/dev/null`
 
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python3 sphinx module" >&5
-printf %s "checking for python3 sphinx module... " >&6; }
-    if $PYTHON3 -c 'import sphinx' >&5 2>&5 ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-    else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-      if test yes = "$with_python3" ; then
-	as_fn_error $? "Couldn't import sphinx module for Python3 - try package python3-sphinx" "$LINENO" 5
-      fi
-      PYTHON3=
-    fi
     if test -n "$PYTHON3" ; then
                   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PYTHON3_INC/Python.h" >&5
 printf %s "checking for $PYTHON3_INC/Python.h... " >&6; }
Index: xapian-bindings-1.4.20/configure.ac
===================================================================
--- xapian-bindings-1.4.20.orig/configure.ac
+++ xapian-bindings-1.4.20/configure.ac
@@ -353,16 +353,6 @@ if test no != "$with_python" ; then
 	fi
       fi
     fi
-    AC_MSG_CHECKING([for python2 sphinx module])
-    if $PYTHON2 -c 'import sphinx;print(repr(sphinx.main))' >&5 2>&5 ; then
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-      if test yes = "$with_python" ; then
-	AC_MSG_ERROR([Couldn't import sphinx module and call sphinx.main() for Python2 - try package python-sphinx])
-      fi
-      PYTHON2=
-    fi
     if test -n "$PYTHON2" ; then
       dnl Check that Python.h is there, which is a good way to check that
       dnl the appropriate python-dev package has been installed.
@@ -434,16 +424,6 @@ if test no != "$with_python3" ; then
       PYTHON3_INC=`$PYTHON3 -c 'import os,sysconfig;print(sysconfig.get_path("include").replace(os.sep,"/"))' 2>/dev/null`
       AC_SUBST(PYTHON3_INC)
     fi
-    AC_MSG_CHECKING([for python3 sphinx module])
-    if $PYTHON3 -c 'import sphinx' >&5 2>&5 ; then
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-      if test yes = "$with_python3" ; then
-	AC_MSG_ERROR([Couldn't import sphinx module for Python3 - try package python3-sphinx])
-      fi
-      PYTHON3=
-    fi
     if test -n "$PYTHON3" ; then
       dnl Check that Python.h is there, which is a good way to check that
       dnl the appropriate python3-dev package has been installed.
Index: xapian-bindings-1.4.20/python/Makefile.am
===================================================================
--- xapian-bindings-1.4.20.orig/python/Makefile.am
+++ xapian-bindings-1.4.20/python/Makefile.am
@@ -151,9 +151,7 @@ sphinxdocs = docs/html/index.html
 
 install-data-local:
 	$(mkinstalldirs) '$(DESTDIR)$(docdir)/python'
-	cp -R -p `test -r docs/html || echo '$(srcdir)/'`docs/html '$(DESTDIR)$(docdir)/python'
-
-all-local: $(sphinxdocs)
+	cp -R -p `test -r docs/index.rst || echo '$(srcdir)/'`docs '$(DESTDIR)$(docdir)/python'
 
 $(sphinxdocs): xapian/__init__.py xapian/_xapian$(PYTHON2_SO) docs/conf.py $(RST_DOCS) $(dist_exampledata_DATA)
 ## We need to run Sphinx for the right version of Python here, so we can't
Index: xapian-bindings-1.4.20/python3/Makefile.am
===================================================================
--- xapian-bindings-1.4.20.orig/python3/Makefile.am
+++ xapian-bindings-1.4.20/python3/Makefile.am
@@ -160,9 +160,7 @@ sphinxdocs = docs/html/index.html
 
 install-data-local:
 	$(mkinstalldirs) '$(DESTDIR)$(docdir)/python3'
-	cp -R -p `test -r docs/html || echo '$(srcdir)/'`docs/html '$(DESTDIR)$(docdir)/python3'
-
-all-local: $(sphinxdocs)
+	cp -R -p `test -r docs/index.rst || echo '$(srcdir)/'`docs '$(DESTDIR)$(docdir)/python3'
 
 $(sphinxdocs): xapian/__init__.py xapian/_xapian$(PYTHON3_EXT_SUFFIX) docs/conf.py $(RST_DOCS) $(dist_exampledata_DATA)
 	PYTHONPATH=..:$$PYTHONPATH $(MACOS_SIP_HACK_ENV) $(PYTHON3) \

Places

File do-not-use-sphinx.diff of Package xapian-bindings (Revision 9c24c843340f1686086ca91a9c453e97)

Places