Fixed support for compiling without modules

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@635 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2006-02-10 06:28:51 +00:00
parent 7de2b93536
commit f657ac6b05
2 changed files with 6 additions and 4 deletions
+3 -3
View File
@@ -11,7 +11,7 @@ all: znc @MODTARGET@
depend::
$(CXX) -MM $(CXXFLAGS) $(SRCS) $(INCLUDES) >.depend
(cd modules; $(MAKE) depend)
@if test -n "@MODTARGET@"; then (cd modules; $(MAKE) depend); fi
znc: $(OBJS)
$(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ $(LIBS) $(OBJS)
@@ -21,11 +21,11 @@ znc-static: $(OBJS)
strip $@
modules::
(cd modules; $(MAKE) all)
@if test -n "@MODTARGET@"; then (cd modules; $(MAKE) all); else echo "Modules are not enabled"; fi
clean:
rm -rf znc znc-static *.o core core.*
(cd modules; $(MAKE) clean)
@if test -n "@MODTARGET@"; then (cd modules; $(MAKE) clean); fi
distclean: clean
rm -rf Makefile config.log config.status znc-config .depend modules/.depend modules/Makefile
+3 -1
View File
@@ -1108,9 +1108,11 @@ bool CZNC::RemVHost(const CString& sHost) {
void CZNC::Broadcast(const CString& sMessage, CUser* pUser) {
for (map<CString,CUser*>::iterator a = m_msUsers.begin(); a != m_msUsers.end(); a++) {
if (a->second != pUser) {
CUser* m_pUser = a->second; // This is a semi-hack because MODULECALLCONT below expects the user to be stored in m_pUser
CString sMsg = sMessage;
#ifdef _MODULES
CUser* m_pUser = a->second; // This is a semi-hack because MODULECALLCONT below expects the user to be stored in m_pUser
MODULECALLCONT(OnBroadcast(sMsg));
#endif
a->second->PutStatusNotice("*** " + sMsg);
}
}