iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge /mnt/c/cygwin/home/Администратор/znc

Browse Source
This commit is contained in:
Alexey Sokolov
2012-08-20 01:03:42 +07:00
parent 502e5d6ace 628f3c8ec1
commit e806ad0f67
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@@ -262,6 +262,25 @@ if test "x$SSL" != "xno"; then
AC_CHECK_LIB( ssl, SSL_shutdown,, SSL=no )
])
if test "x$SSL" != "xno"; then
AC_MSG_CHECKING([whether openssl is usable])
AC_LINK_IFELSE([
AC_LANG_PROGRAM([[
#include <openssl/ssl.h>
]], [[
SSL_CTX* ctx = SSL_CTX_new(TLSv1_method());
SSL* ssl = SSL_new(ctx);
DH* dh = DH_new();
]])
], [
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
SSL=no
])
fi
if test "x$SSL" = "xno" ; then
ZNC_AUTO_FAIL([SSL],
[OpenSSL not found. Try --disable-openssl.],
@@ -505,6 +524,7 @@ AC_SUBST([LDFLAGS])
AC_SUBST([LIBS])
AC_SUBST([LIBZNC])
AC_SUBST([LIBZNCDIR])
AC_SUBST([ISCYGWIN])
AC_SUBST([MODLINK])
AC_SUBST([NOSSL])
AC_SUBST([TCL_FLAGS])

11
modules/Makefile.in
View File

@@ -20,9 +20,16 @@ CXX := @CXX@
MODFLAGS := -I$(srcdir)/../include -I../include @CPPFLAGS@ @MODFLAGS@
MODLINK := @MODLINK@
LDFLAGS := @LDFLAGS@
# LIBS are not and should not be used in here.
# The znc binary links already against those.
# LIBS := @LIBS@
# ...but not on cygwin!
LIBS :=
ifeq "@ISCYGWIN@" "1"
LIBS += @LIBS@
LDFLAGS += ${LIBS}
endif
PERL_ON := @PERL@
PERL := @PERL_BINARY@
PYTHON_ON:= @PYTHON@
@@ -118,7 +125,7 @@ clean:
%.so: %.o Makefile
$(E) Linking module $(notdir $(basename $@))...
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))LDFLAGS)
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))LDFLAGS) $(LIBS)
uninstall:
# Yes, we are lazy, just remove everything in there

2
modules/modperl/Makefile.inc
View File

@@ -32,7 +32,7 @@ modperl_all: modperl/ZNC.so modperl/swigperlrun.h modperl/functions.cpp
modperl/ZNC.so: modperl/ZNC.o Makefile
$(E) Linking ZNC Perl bindings library...
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) $(PERL_LD) -o $@ $<
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PERL_LD)
modperl/ZNC.o: modperl/ZNC.cpp Makefile
@mkdir -p modperl

16
src/ZNCString.cpp
View File

@@ -144,25 +144,13 @@ CString& CString::MakeLower() {
CString CString::AsUpper() const {
CString sRet = *this;
for (size_type a = 0; a < length(); a++) {
char& c = sRet[a];
//TODO use unicode
c = (char)toupper(c);
}
sRet.MakeUpper();
return sRet;
}
CString CString::AsLower() const {
CString sRet = *this;
for (size_type a = 0; a < length(); a++) {
char& c = sRet[a];
//TODO use unicode
c = (char)tolower(c);
}
sRet.MakeLower();
return sRet;
}