added '--disable-uwebsocket' build flag

conf/libuniset2.spec

@@ -14,6 +14,7 @@
 %def_enable logdb
 %def_enable opentsdb
 %def_enable uresolver
+%def_disable uwebsocket
 
 %ifarch %ix86
 %def_enable com485f
@@ -25,7 +26,7 @@
 
 Name: libuniset2
 Version: 2.10.1
-Release: alt1
+Release: alt2
 Summary: UniSet - library for building distributed industrial control systems
 
 License: LGPL-2.1
@@ -369,7 +370,7 @@ Libraries needed to develop for uniset MQTT extension
 
 %build
 %autoreconf
-%configure %{subst_enable docs} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable pgsql} %{subst_enable python} %{subst_enable rrd} %{subst_enable io} %{subst_enable logicproc} %{subst_enable tests} %{subst_enable mqtt} %{subst_enable api} %{subst_enable netdata} %{subst_enable logdb} %{subst_enable com485f} %{subst_enable opentsdb}
+%configure %{subst_enable docs} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable pgsql} %{subst_enable python} %{subst_enable rrd} %{subst_enable io} %{subst_enable logicproc} %{subst_enable tests} %{subst_enable mqtt} %{subst_enable api} %{subst_enable netdata} %{subst_enable logdb} %{subst_enable com485f} %{subst_enable opentsdb} %{subst_enable uwebsocket}
 %make_build
 
 %install
@@ -548,12 +549,15 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
 %_includedir/%oname/extensions/mqtt/
 %endif
 
+%if_enabled api
 %if_enabled uresolver
 %files extension-uresolver
 %_bindir/%oname-httpresolver*
 %endif
+%endif
 
 %if_enabled api
+%if_enabled uwebsocket
 %files extension-wsgate
 %_bindir/%oname-wsgate*
 %_libdir/libUniSet2UWebSocketGate*.so.*
@@ -563,6 +567,7 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
 %_libdir/libUniSet2UWebSocketGate*.so
 %_includedir/%oname/extensions/wsgate/
 %endif
+%endif
 
 %files extension-common-devel
 %dir %_includedir/%oname/extensions

configure.ac

@@ -4,7 +4,7 @@
 
 # AC_PREREQ(2.59)
 AC_INIT([uniset2], [2.10.1], pv@etersoft.ru)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
 
 LIBVER=12:1:10
 AC_SUBST(LIBVER)
@@ -401,6 +401,26 @@ fi
 AM_CONDITIONAL(DISABLE_LOGDB, test ${buildlogdb} = false)
 AM_CONDITIONAL(ENABLE_LOGDB, test ${buildlogdb} = true)
 
+#check uwebsocket
+AC_MSG_CHECKING([uwebsocket build])
+uwebsocket=true
+AC_ARG_ENABLE(uwebsocket, AC_HELP_STRING([--disable-uwebsocket], [disable UWebSocketGate build]),
+[ if test $enableval = yes; then uwebsocket=true; else uwebsocket=false; fi],[ uwebsocket=true; ])
+
+if test ${buildapi} = true; then
+  if test ${uwebsocket} = true; then
+	AC_MSG_RESULT([enabled])
+  else
+	AC_MSG_RESULT([disabled])
+  fi
+else
+    uwebsocket=false
+    AC_MSG_RESULT([disabled (uwebsocketgate disabled)])
+fi
+
+AM_CONDITIONAL(DISABLE_UWEBSOCKETGATE, test ${uwebsocket} = false)
+AM_CONDITIONAL(ENABLE_UWEBSOCKETGATE, test ${uwebsocket} = true)
+
 COV_LIBS=
 COV_CFLAGS=
 AC_MSG_CHECKING([tests support])

extensions/UWebSocketGate/Makefile.am

-if ENABLE_REST_API
+if ENABLE_UWEBSOCKETGATE
 bin_PROGRAMS = @PACKAGE@-wsgate
 
 WSGATE_VER=@LIBVER@

extensions/UWebSocketGate/tests/Makefile.am

 if HAVE_TESTS
+if ENABLE_UWEBSOCKETGATE
 
 noinst_PROGRAMS = tests-with-sm
 
@@ -23,3 +24,4 @@ clean-local:
 include $(top_builddir)/include.mk
 
 endif
+endif