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

modules/Makefile.in

@@ -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

modules/modperl/Makefile.inc

@@ -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