treewide: favor Xapian (SWIG binding) over Search::Xapian

The Xapian SWIG bindings are favored by Xapian upstream for
ease-of-maintenance compared to the XS version.  While Debian
lags on this front, the SWIG bindings are widely available
on all *BSDs.

2 files changed, 2 insertions, 3 deletions

diff --git a/script/public-inbox-cindex b/script/public-inbox-cindex
index 0526434c..b5fe9cf8 100755
--- a/script/public-inbox-cindex
+++ b/script/public-inbox-cindex
@@ -46,7 +46,7 @@ require PublicInbox::Admin;
 PublicInbox::Admin::do_chdir(delete $opt->{C});
 my $cfg = PublicInbox::Config->new;
 my $cidx_dir = $opt->{d};
-PublicInbox::Admin::require_or_die('Search::Xapian');
+PublicInbox::Admin::require_or_die('Xapian');
 PublicInbox::Admin::progress_prepare($opt);
 my $env = PublicInbox::Admin::index_prepare($opt, $cfg);
 %ENV = (%ENV, %$env) if $env;
diff --git a/script/public-inbox-index b/script/public-inbox-index
index f29e7c3c..74232ebf 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -113,8 +113,7 @@ The following inboxes are unconfigured and will not be updated in
 @$update_extindex:\n@eidx_unconfigured
 EOF
 
-# "Search::Xapian" includes SWIG "Xapian", too:
-$opt->{compact} = 0 if !$mods->{'Search::Xapian'};
+$opt->{compact} = 0 if !$mods->{'Xapian'}; # (or old Search::Xapian)
 
 PublicInbox::Admin::require_or_die(keys %$mods);
 my $env = PublicInbox::Admin::index_prepare($opt, $cfg);