From 33f7342cecfa8465d629a85fef741c4ed4ca7fb2 Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sat, 30 May 2015 00:30:35 +0200 Subject: [PATCH] Enable plugin support on legacy debian folder and add a missing conditional build in zm_monitor.cpp --- distros/debian/rules | 2 +- src/zm_monitor.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distros/debian/rules b/distros/debian/rules index d07d3b823..a0f8826c4 100755 --- a/distros/debian/rules +++ b/distros/debian/rules @@ -28,7 +28,7 @@ endif dh $@ --with quilt,autoreconf override_dh_auto_configure: - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr --with-mariadb=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr --with-mariadb=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes --enable-plugin-support --with-pluginsdir=/usr/lib/zoneminder/plugins override_dh_clean: # Add here commands to clean up after the build process. diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index b3b81e7b6..b86bf017a 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -3125,13 +3125,13 @@ bool Monitor::closeEvent() { gettimeofday( &(event->EndTime()), NULL ); } - +#if ZM_PLUGINS_ON // Inform all plugins that we are closing the event if ( config.load_plugins && ( purpose == ANALYSIS ) ) { ThePluginManager.getImageAnalyser().onCloseEvent( zones, event ); } - +#endif event->Close(); delete event;