Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix SSL on cygwin.

  • Loading branch information...
commit f94cb24fedf6b4f6da32ffb29062339ce41024b5 1 parent 3347390
@DarthGandalf DarthGandalf authored
Showing with 29 additions and 2 deletions.
  1. +20 −0 configure.ac
  2. +9 −2 modules/Makefile.in
View
20 configure.ac
@@ -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])
View
11 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
Please sign in to comment.
Something went wrong with that request. Please try again.