Attachment #204406 for bug #237929

View | Details | Raw Unified | Return to bug 237929
Collapse All | Expand All

Lines 24-29 Link Here

(-)Makefile (+2 lines)
24	--with-libevent=${LOCALBASE} \	24	--with-libevent=${LOCALBASE} \
25	--with-libmaxminddb=${LOCALBASE} \	25	--with-libmaxminddb=${LOCALBASE} \
26	--with-openssl=${OPENSSLBASE}	26	--with-openssl=${OPENSSLBASE}
		27	CONFIGURE_ENV= CC=${CC} \
		28	CXX=${CXX}
27		29
28	INSTALL_TARGET= install-strip	30	INSTALL_TARGET= install-strip
29	PORTDOCS= README.md include/README.md	31	PORTDOCS= README.md include/README.md




--- m4/mk.m4.orig	2019-05-16 20:09:11 UTC
+++ m4/mk.m4
@@ -90,8 +90,10 @@ AC_DEFUN([MK_AM_OPENSSL], [
                 [SSL toolkit @<:@default=check@:>@])
               ],
               [
-                CPPFLAGS="$CPPFLAGS -I$withval/include"
-                LDFLAGS="$LDFLAGS -L$withval/lib"
+		if test ${with_openssl} != /usr; then
+                  CPPFLAGS="$CPPFLAGS -I$withval/include"
+                  LDFLAGS="$LDFLAGS -L$withval/lib"
+		fi
               ],
               [
 	        if test -d /usr/local/Cellar/openssl; then

Return to bug 237929

Line 0 Link Here

(-)files/patch-m4_mk.m4 (+15 lines)
	1	--- m4/mk.m4.orig 2019-05-16 20:09:11 UTC
	2	+++ m4/mk.m4
	3	@@ -90,8 +90,10 @@ AC_DEFUN([MK_AM_OPENSSL], [
	4	[SSL toolkit @<:@default=check@:>@])
	5	],
	6	[
	7	- CPPFLAGS="$CPPFLAGS -I$withval/include"
	8	- LDFLAGS="$LDFLAGS -L$withval/lib"
	9	+ if test ${with_openssl} != /usr; then
	10	+ CPPFLAGS="$CPPFLAGS -I$withval/include"
	11	+ LDFLAGS="$LDFLAGS -L$withval/lib"
	12	+ fi
	13	],
	14	[
	15	if test -d /usr/local/Cellar/openssl; then