--- configure.orig	2024-03-07 22:58:52 UTC
+++ configure
@@ -18948,19 +18948,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; }
@@ -21080,7 +21067,7 @@ if test yes = "$GXX" ; then
 if test yes = "$GXX" ; then
                     SWIG_CXXFLAGS="-fno-strict-aliasing"
 
-              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
+              XAPIAN_LIBS="$XAPIAN_LIBS"
 
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext