From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 3 Mar 2014 15:29:23 +0000 (-0500)
Subject: LP#1268619: websocket: avoid module auto configuration
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b3ca846fd7e1390d6b83b3035f473a5902fec733;p=working%2FOpenSRF.git

LP#1268619: websocket: avoid module auto configuration

We don't want osrf_websocket_translator to be directly loaded as a
module, since it is not an apache module, but a shared library loaded by
an apache module (mod_websockets).  This is especially true of the default
apache instance.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

diff --git a/src/gateway/Makefile.am b/src/gateway/Makefile.am
index 04a7632..54da170 100644
--- a/src/gateway/Makefile.am
+++ b/src/gateway/Makefile.am
@@ -37,7 +37,7 @@ install-exec-local:
 	$(MKDIR_P) $(DESTDIR)$(AP_LIBEXECDIR)
 	$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_json_gateway.la
 	$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_http_translator.la
-	$(APXS2) -n osrf_websocket_translator -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_websocket_translator.la
+	$(APXS2) -n osrf_websocket_translator -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_websocket_translator.la
 
 clean-local:
 	rm -f @srcdir@/osrf_http_translator.la @srcdir@/osrf_http_translator.lo @srcdir@/osrf_http_translator.slo @srcdir@/osrf_json_gateway.la @srcdir@/osrf_json_gateway.lo @srcdir@/osrf_json_gateway.slo  @srcdir@/osrf_websocket_translator.la @srcdir@/osrf_websocket_translator.lo @srcdir@/osrf_websocket_translator.slo