version 0.4.1: allow specifying custom OpenSSL 1.1.x path to configure

with --with-openssl=<dir>


Signed-off-by: Hans Zandbelt <hans.zandbelt@zmartzone.eu>

ChangeLog

@@ -1,3 +1,7 @@
+08/08/2018
+- allow specifying custom OpenSSL 1.1.x path to configure with --with-openssl=<dir>
+- version 0.4.1
+
 08/06/2018
 - use standard mod_ssl primitives for registering hooks
   so that mod_token_binding works with any stock Apache 2.x version now

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([mod_token_binding],[0.4.0],[hans.zandbelt@zmartzone.eu])
+AC_INIT([mod_token_binding],[0.4.1],[hans.zandbelt@zmartzone.eu])
 
 AC_SUBST(NAMEVER, AC_PACKAGE_TARNAME()-AC_PACKAGE_VERSION())
 
@@ -43,15 +43,37 @@ AC_SUBST(APXS2)
 # Use environment variable APXS2_OPTS to pass params to APXS2 command
 AC_ARG_VAR(APXS2_OPTS, [Additional command line options to pass to apxs2.])
 
-# We need OpenSSL for crypto
-PKG_CHECK_MODULES(OPENSSL, openssl)
-AC_SUBST(OPENSSL_CFLAGS)
-AC_SUBST(OPENSSL_LIBS)
-
 PKG_CHECK_MODULES(APR, [apr-1, apr-util-1])
 AC_SUBST(APR_CFLAGS)
 AC_SUBST(APR_LIBS)
 
+HAVE_OPENSSL=0
+
+AC_ARG_WITH(openssl,
+        [  --with-openssl=PATH          location of your OpenSSL 1.1.x installation])
+
+if test -n "$with_openssl"
+then
+    OPENSSL_CFLAGS="-I$with_openssl/include"
+    OPENSSL_LIBS="-L$with_openssl/lib -lssl -lcrypto"
+
+	CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS"
+	AC_CHECK_HEADERS([openssl/ssl.h], , [HAVE_OPENSSL=0])
+
+	LDFLAGS="$OPENSSL_LIBS $LDFLAGS"
+	AC_CHECK_LIB([ssl], [OPENSSL_init_ssl], [HAVE_OPENSSL=1], [HAVE_OPENSSL=0])
+	if test "x$have_openssl" = "x0" ; then
+  		AC_MSG_WARN("cannot find library for -lssl.")
+	fi
+else
+	PKG_CHECK_MODULES(OPENSSL, openssl)
+fi
+
+AC_SUBST(HAVE_OPENSSL)
+AC_SUBST(OPENSSL_CFLAGS)
+AC_SUBST(OPENSSL_LIBS)
+
+
 AC_MSG_CHECKING([for Token Bind library])
 AC_ARG_WITH(
 	[token-binding],

test/docker/.dockerignore

@@ -0,0 +1,2 @@
+./Dockerfile
+./Makefile

test/docker/Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get clean && apt-get --fix-missing update
 RUN apt-get update && apt-get install -y apt-utils build-essential autoconf automake libtool-bin
 RUN apt-get update && apt-get install -y git subversion wget
 RUN apt-get update && apt-get install -y python libpcre3-dev libexpat1-dev
-RUN apt-get update && apt-get install -y pkg-config apache2
+RUN apt-get update && apt-get install -y pkg-config
 
 WORKDIR /root
 ENV TARGET_DIR /usr/local