From: Alexander Barton <alex@barton.de>
Date: Mon, 1 Jul 2019 19:56:36 +0000 (+0200)
Subject: Make sure HAVE_LIBSSL is defined, even when using pkg-config
X-Git-Tag: rel-26-rc1~64
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=b1893e740e745cc5081ef59719bb10bc5f729fdb

Make sure HAVE_LIBSSL is defined, even when using pkg-config

Without this, the configure script assumes and states that OpenSSL will
be used, but the code won't include support for it because there we use
the "HAVE_LIBSSL" define to test for it ("#ifdef HAVE_LIBSSL").

So define the latter when pkg-config(1) is used, too.

This fixes #257, a regression introduced by commit ad86a41ee :-/
---

diff --git a/configure.ng b/configure.ng
index 899d00f7..367c2f0c 100644
--- a/configure.ng
+++ b/configure.ng
@@ -465,7 +465,8 @@ AC_ARG_WITH(openssl,
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
 			PKG_CHECK_MODULES([OPENSSL], [libssl libcrypto],
-				[LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"],
+				[LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+				AC_DEFINE(HAVE_LIBSSL, 1)],
 				[AC_CHECK_LIB(crypto, BIO_s_mem)
 				AC_CHECK_LIB(ssl, SSL_new)]
 			)