[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-201-g3e2ccab

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 3e2ccaba71186cbb385c00f3ff44c6f34dba92d7
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Wed Jun 15 17:05:34 2011 +0100

    ./configure --disable-opensearch: only operate on dependencies not opensearch itself

diff --git a/ChangeLog b/ChangeLog
index 65a6c6e..0c32e22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
 	  all the .IN rules. The solution we used for this until now was
 	  specific to GNU make.
 	* Removed Makefile.include, no longer used.
+	* './configure --enable-opensearch' now only controls
+	  installation of the (direct) dependencies for opensearch,
+	  not opensearch itself, as opensearch now falls back to
+	  using a remote reflector if opensearch-discover(1)
+	  and opensearch-genquery(1) aren't found.
 	* yandex: fix test.
 
 2011-06-14  Ian Beckwith  <ianb at erislabs.net>
diff --git a/Makefile.am b/Makefile.am
index 7143d0d..faa1836 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,9 +86,6 @@ install-data-hook: links
 	do \
 		ln -sf $$target  $(DESTDIR)/$$link ;\
 	done < links
-if OPENSEARCH
-	ln -sf elvi.1sr.gz $(DESTDIR)/@mandir@/man1/opensearch.1sr.gz
-endif
 if INSTALLSR
 	ln -sf surfraw $(DESTDIR)/@bindir@/sr
 	ln -sf surfraw.1.gz $(DESTDIR)/@mandir@/man1/sr.1.gz
@@ -103,9 +100,6 @@ uninstall-local: links
 	do \
 		rm -f $(DESTDIR)/$$link ;\
 	done < links
-if OPENSEARCH
-	rm -f $(DESTDIR)/@mandir@/man1/opensearch.1sr.gz
-endif
 if INSTALLSR
 	rm -f $(DESTDIR)/@bindir@/sr
 	rm -f $(DESTDIR)/@mandir@/man1/sr.1.gz
diff --git a/configure.in b/configure.in
index 19d441c..e06f47e 100644
--- a/configure.in
+++ b/configure.in
@@ -11,9 +11,9 @@ AC_CONFIG_SRCDIR([surfraw.IN])
 dnl minimum automake version, not surfraw version
 AM_INIT_AUTOMAKE([1.10])
 
-AC_MSG_CHECKING([whether to enable OpenSearch support])
+AC_MSG_CHECKING([whether to enable local OpenSearch support])
 AC_ARG_ENABLE([opensearch],
-	[AS_HELP_STRING([--disable-opensearch], [disable OpenSearch support])],,
+	[AS_HELP_STRING([--disable-opensearch], [disable local OpenSearch support])],,
 	[enable_opensearch=yes])
 AC_MSG_RESULT([$enable_opensearch])
 AM_CONDITIONAL(OPENSEARCH, test "$enable_opensearch" = "yes")
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index a3e8120..103de84 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -74,6 +74,7 @@ dist_elvi_SCRIPTS	= \
 		  ntrs \
 		  openbsd \
 		  openports \
+		  opensearch \
 		  pasearch \
 		  piratebay \
 		  pgpkeys \
@@ -113,9 +114,5 @@ dist_elvi_SCRIPTS	= \
 		  youtube \
 		  yubnub
 
-if OPENSEARCH
-dist_elvi_SCRIPTS	+= opensearch
-endif
-
 uninstall-local:
 	-rmdir $(DESTDIR)$(PREFIX)/$(ELVIDIR)
diff --git a/links.IN b/links.IN
index 9e09734..3d9a75f 100644
--- a/links.IN
+++ b/links.IN
@@ -70,6 +70,7 @@ elvi.1sr.gz @mandir@/man1/netbsd.1sr.gz
 elvi.1sr.gz @mandir@/man1/ntrs.1sr.gz
 elvi.1sr.gz @mandir@/man1/openbsd.1sr.gz
 elvi.1sr.gz @mandir@/man1/openports.1sr.gz
+elvi.1sr.gz @mandir@/man1/opensearch.1sr.gz
 elvi.1sr.gz @mandir@/man1/pasearch.1sr.gz
 elvi.1sr.gz @mandir@/man1/piratebay.1sr.gz
 elvi.1sr.gz @mandir@/man1/pgpkeys.1sr.gz

-- 
surfraw -  a fast unix command line interface to WWW