Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (340225e3754d024590abfabcf638750d192d6355)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (340225e3754d024590abfabcf638750d192d6355)
  • Date: Fri, 18 Sep 2009 22:38:05 -0500

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

collab/ikiwiki/CONFIGURE | 1 +
collab/ikiwiki/DEPENDS | 8 +++++++-
collab/ikiwiki/HISTORY | 5 +++++
3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 340225e3754d024590abfabcf638750d192d6355
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

collab/ikiwiki: better search engine support

Query the user if they want search engine support, and if so depend on
search-xapian but also runtime depend on xapian-omega, since the
search-xapian interface can do nothing if the actual search engine isn't
installed.

diff --git a/collab/ikiwiki/CONFIGURE b/collab/ikiwiki/CONFIGURE
new file mode 100755
index 0000000..308c799
--- /dev/null
+++ b/collab/ikiwiki/CONFIGURE
@@ -0,0 +1 @@
+config_query IKI_SEARCH "include support for xapian omega search engine?" y
diff --git a/collab/ikiwiki/DEPENDS b/collab/ikiwiki/DEPENDS
index f7752e0..6dbfa60 100755
--- a/collab/ikiwiki/DEPENDS
+++ b/collab/ikiwiki/DEPENDS
@@ -10,7 +10,13 @@ depends data-dumper &&
depends date-format &&
depends cgi-session &&
depends db_file &&
-optional_depends search-xapian '' '' 'For searching using the xapian system'
&&
+
+if [[ $IKI_SEARCH == y ]]
+then
+ runtime_depends xapian-omega &&
+ depends search-xapian
+fi &&
+
optional_depends cgi-formbuilder '' '' 'To use the CGI interface for editing
pages' &&
message "${MESSAGE_COLOR}You need one backend at least!${DEFAULT_COLOR}" &&
optional_depends git '' '' 'To use git as the backend' &&
diff --git a/collab/ikiwiki/HISTORY b/collab/ikiwiki/HISTORY
index 5286383..de4d077 100644
--- a/collab/ikiwiki/HISTORY
+++ b/collab/ikiwiki/HISTORY
@@ -1,3 +1,8 @@
+2009-09-18 Justin Boffemmyer <flux AT sourcemage.org>
+ * CONFIGURE: added, query for search engine support
+ * DEPENDS: depend on xapian-omega in addition to search-xapian, but
+ only if the user wants search engine support
+
2009-09-17 Justin Boffemmyer <flux AT sourcemage.org>
* DEPENDS: suggest having a webserver




  • [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (340225e3754d024590abfabcf638750d192d6355), Justin Boffemmyer, 09/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page