ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable plugin support on legacy debian folder and add a missing conditional build in zm_monitor.cpp

This commit is contained in:
Emmanuel Papin 2015-05-30 00:30:35 +02:00
parent de2ec868b4
commit 33f7342cec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distros/debian/rules
View File

@ -28,7 +28,7 @@ endif
dh $@ --with quilt,autoreconf dh $@ --with quilt,autoreconf
override_dh_auto_configure: 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: override_dh_clean:
# Add here commands to clean up after the build process. # Add here commands to clean up after the build process.

4
src/zm_monitor.cpp
View File

@ -3125,13 +3125,13 @@ bool Monitor::closeEvent()
{ {
gettimeofday( &(event->EndTime()), NULL ); gettimeofday( &(event->EndTime()), NULL );
} }
#if ZM_PLUGINS_ON
// Inform all plugins that we are closing the event // Inform all plugins that we are closing the event
if ( config.load_plugins && ( purpose == ANALYSIS ) ) if ( config.load_plugins && ( purpose == ANALYSIS ) )
{ {
ThePluginManager.getImageAnalyser().onCloseEvent( zones, event ); ThePluginManager.getImageAnalyser().onCloseEvent( zones, event );
} }
#endif
event->Close(); event->Close();
delete event; delete event;