Permalink
Browse files

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

  • Loading branch information...
2 parents d9ec39d + 84ec497 commit 5e688f0dea330d790ce475efb85ae135e16a346d @DarthGandalf DarthGandalf committed Sep 25, 2012
Showing with 11 additions and 15 deletions.
  1. +2 −8 Makefile.in
  2. +4 −0 configure.ac
  3. +1 −1 m4/ax_pthread.m4
  4. +3 −3 modules/modperl/Makefile.inc
  5. +1 −3 modules/modpython/Makefile.inc
View
@@ -58,12 +58,6 @@ E=@\#
C=
endif
-ifeq "@PYTHON@" ""
-JOBHACK=
-else
-JOBHACK=-j1
-endif
-
.PHONY: all man modules clean distclean install version_extra_recompile
.SECONDARY:
@@ -92,7 +86,7 @@ man:
@$(MAKE) -C man $(C)
modules: $(LIBZNC)
- @$(MAKE) -C modules $(C) $(JOBHACK)
+ @$(MAKE) -C modules $(C)
clean:
rm -rf $(CLEAN)
@@ -131,7 +125,7 @@ install: znc $(LIBZNC)
$(INSTALL_DATA) $(srcdir)/include/znc/*.h $(DESTDIR)$(includedir)/znc
$(INSTALL_DATA) include/znc/zncconfig.h $(DESTDIR)$(includedir)/znc
$(INSTALL_DATA) znc.pc $(DESTDIR)$(PKGCONFIGDIR)
- @$(MAKE) -C modules $(JOBHACK) install DESTDIR=$(DESTDIR);
+ @$(MAKE) -C modules install DESTDIR=$(DESTDIR);
if test -n "$(LIBZNC)"; then \
test -d $(DESTDIR)$(LIBZNCDIR) || $(INSTALL) -d $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
$(INSTALL_PROGRAM) $(LIBZNC) $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
View
@@ -224,6 +224,7 @@ if test "x$TDNS" != "xno"; then
#include <netdb.h>
]], [[
int x = AI_ADDRCONFIG;
+ (void) x;
]])
], [
AC_MSG_RESULT([yes])
@@ -280,6 +281,9 @@ if test "x$SSL" != "xno"; then
SSL_CTX* ctx = SSL_CTX_new(TLSv1_method());
SSL* ssl = SSL_new(ctx);
DH* dh = DH_new();
+ DH_free(dh);
+ SSL_free(ssl);
+ SSL_CTX_free(ctx);
]])
], [
AC_MSG_RESULT([yes])
View
@@ -274,7 +274,7 @@ if test "x$ax_pthread_ok" = xyes; then
AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
ax_cv_PTHREAD_PRIO_INHERIT, [
AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
+ AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT; (void) i;]])],
[ax_cv_PTHREAD_PRIO_INHERIT=yes],
[ax_cv_PTHREAD_PRIO_INHERIT=no])
])
@@ -15,10 +15,10 @@ modperlLDFLAGS := $(PERL_LD)
modperlCXXFLAGS += -I.
ifeq "$(ISCYGWIN)" "1"
-PERLCEXT_EXT := "dll"
-PERLDEPONMOD := "modperl.so"
+PERLCEXT_EXT := dll
+PERLDEPONMOD := modperl.so
else
-PERLCEXT_EXT := "so"
+PERLCEXT_EXT := so
PERLDEPONMOD :=
endif
@@ -57,9 +57,7 @@ modpython/_znc_core.$(PYCEXT_EXT): modpython/_znc_core.o Makefile modpython.so
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PY_LDFLAGS) $(PYDEPONMOD)
ifneq "$(SWIG)" ""
-modpython/znc_core.py modpython/_znc_core.cpp modpython/functions.cpp modpython/swigpyrun.h: modpython/codegen.pl modpython/functions.in Makefile
- @mkdir -p modpython .depend
- $(Q)$(MAKE) -f $(srcdir)/modpython/Makefile.gen $(C) SWIG="$(SWIG)" srcdir="$(srcdir)" PERL="$(PERL)" VERBOSE="$(VERBOSE)" SED="$(SED)"
+include $(srcdir)/modpython/Makefile.gen
endif
modpython.o: modpython/functions.cpp

0 comments on commit 5e688f0

Please sign in to comment.