The host= parameter for loleaflet.html does not exist any more.

Now loolwsd fills that in directly.

Also show http:// or https:// in 'make run' according to the configuration.
This commit is contained in:
Jan Holesovsky 2016-04-13 18:31:10 +02:00
parent b09b6eab89
commit efb67d68fd
3 changed files with 5 additions and 1 deletions

View file

@ -105,7 +105,9 @@ clean-local:
run: @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo "Launching loolwsd - launch this in your browser:"
@echo " https://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello.odt&host=wss://localhost:9980"
@PROTOCOL="http" ; if test "z@ENABLE_SSL@" != "z"; then PROTOCOL="https" ; fi ; \
echo " $$PROTOCOL://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello.odt"
@echo
./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
--childroot="@JAILS_PATH@" --allowlocalstorage
else

View file

@ -177,6 +177,8 @@ else
ssl_msg="insecure: ssl disabled"
fi
AC_SUBST(ENABLE_SSL)
LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX} -lPocoXML${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX} -lPocoCrypto${POCO_DEBUG_SUFFIX}"
AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h],

Binary file not shown.