adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 17:03:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:znc/znc

Browse Source
This commit is contained in:
Alexey Sokolov
2011-09-04 10:34:37 +07:00
parent 982812e282 ce5d73c9cd
commit 27d51d9341
7 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+1 -1
View File
@@ -15,7 +15,7 @@ includedir := @includedir@
sbindir := @sbindir@
localstatedir := @localstatedir@
CXX := @CXX@
CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@ -I.
CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I.
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
LIBZNC := @LIBZNC@
modules/Makefile.in
+1 -1
View File
@@ -17,7 +17,7 @@ sbindir := @sbindir@
localstatedir := @localstatedir@
CXX := @CXX@
# CXXFLAGS are for the main binary, so don't use them here, use MODFLAGS instead
MODFLAGS := @DEFS@ @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/.. -I..
MODFLAGS := @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/.. -I..
MODLINK := @MODLINK@
LDFLAGS := @LDFLAGS@
# LIBS are not and should not be used in here.
modules/admin.cpp
+3 -3
View File
@@ -356,11 +356,11 @@ class CAdminMod : public CModule {
else if (sVar == "buffer")
PutModule("Buffer = " + CString(pChan->GetBufferCount()));
else if (sVar == "inconfig")
PutModule("InConfig = " + pChan->InConfig());
PutModule("InConfig = " + CString(pChan->InConfig()));
else if (sVar == "keepbuffer")
PutModule("KeepBuffer = " + pChan->KeepBuffer());
PutModule("KeepBuffer = " + CString(pChan->KeepBuffer()));
else if (sVar == "detached")
PutModule("Detached = " + pChan->IsDetached());
PutModule("Detached = " + CString(pChan->IsDetached()));
else if (sVar == "key")
PutModule("Key = " + pChan->GetKey());
else
test/Makefile.in
+1 -1
View File
@@ -5,7 +5,7 @@ srcdir := @srcdir@
VPATH := @srcdir@
CXX := @CXX@
CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@ -I..
CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I..
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
znc-config.in
+1 -1
View File
@@ -7,7 +7,7 @@ bindir="@bindir@"
datadir="@datadir@"
CXX="@CXX@"
CXXFLAGS="@DEFS@ @CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
CXXFLAGS="@CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
MODLINK="@MODLINK@"
# LIBS="@LIBS@"
# No libs needed, ZNC links against $LIBS and thus modules don't need to.
znc-uninstalled.pc.in
+1 -2
View File
@@ -7,7 +7,6 @@ datadir=@datadir@
includedir=@includedir@
cxx=@CXX@
DEFS=@DEFS@
CPPFLAGS=@CPPFLAGS@
MODFLAGS=@MODFLAGS@
version=@PACKAGE_VERSION@
@@ -23,4 +22,4 @@ Name: ZNC
Description: An advanced IRC proxy
Version: ${version}
URL: http://znc.in
Cflags: ${DEFS} ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
znc.pc.in
+1 -2
View File
@@ -7,7 +7,6 @@ datadir=@datadir@
includedir=@includedir@
cxx=@CXX@
DEFS=@DEFS@
CPPFLAGS=@CPPFLAGS@
MODFLAGS=@MODFLAGS@
version=@PACKAGE_VERSION@
@@ -21,4 +20,4 @@ Name: ZNC
Description: An advanced IRC proxy
Version: ${version}
URL: http://znc.in
Cflags: ${DEFS} ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}