Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: znc/znc
base: 9b2898f603e2
...
head fork: znc/znc
compare: 84ec49780e8a
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Commits on Sep 23, 2012
@psychon psychon Fix configure with -Werror=unused-variable
Signed-off-by: Uli Schlachter <psychon@znc.in>
afb4830
@psychon psychon Fix modperl re-building
Make was always rebuilding modperl/ZNC.so because the Makefile was actually
describing a file modperl/ZNC."so". Fix this by getting rid of the unnecessary
pair of quotes.

Signed-off-by: Uli Schlachter <psychon@znc.in>
9c14a86
@psychon psychon Get rid of the modpythin jobhack
This exists to fix a problem where the python swig API was generated multiple
times in parallel with "make -j3". This problems turns out to be due to the
multiple target rule that this commit removes. Such a rule doesn't mean "this
commands generate multiple files at once" but means "you can use this command
for each of these targets".

Fix this by including Makefile.gen instead of calling it in its own make
process. That way we don't need this "meta rule" which just calls another
Makefile but can use the "real" rules immediately.

Signed-off-by: Uli Schlachter <psychon@znc.in>
84ec497
View
10 Makefile.in
@@ -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
4 configure.ac
@@ -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
2  m4/ax_pthread.m4
@@ -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])
])
View
6 modules/modperl/Makefile.inc
@@ -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
View
4 modules/modpython/Makefile.inc
@@ -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

No commit comments for this range

Something went wrong with that request. Please try again.