From 0054ea6684a933037af1cc3bc6358c7096dc051c Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 3 Mar 2014 10:29:23 -0500 Subject: [PATCH] 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 Signed-off-by: Galen Charlton --- src/gateway/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.43.2