From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 16 Aug 2022 14:07:45 +0000 (+0200)
Subject: Fix a bunch of build errors on MacOS related to the location of libcrypto
X-Git-Tag: rec-4.8.0-alpha1~29^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a366caed37b0ede011378c46c8b11473fdf0945;p=thirdparty%2Fpdns.git

Fix a bunch of build errors on MacOS related to the location of libcrypto
---

diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am
index 59916b0591..58663f50b9 100644
--- a/modules/bindbackend/Makefile.am
+++ b/modules/bindbackend/Makefile.am
@@ -1,5 +1,5 @@
 pkglib_LTLIBRARIES = libbindbackend.la
-AM_CPPFLAGS += -I../../pdns
+AM_CPPFLAGS += -I../../pdns $(LIBCRYPTO_INCLUDES)
 
 AM_LFLAGS = -i
 AM_YFLAGS = -d --verbose --debug
diff --git a/modules/geoipbackend/Makefile.am b/modules/geoipbackend/Makefile.am
index a11b31ab24..f9622206ff 100644
--- a/modules/geoipbackend/Makefile.am
+++ b/modules/geoipbackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS += $(YAML_CFLAGS) $(GEOIP_CFLAGS) $(MMDB_CFLAGS)
+AM_CPPFLAGS += $(YAML_CFLAGS) $(GEOIP_CFLAGS) $(MMDB_CFLAGS) $(LIBCRYPTO_INCLUDES)
 
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am
index 44f1b354ed..4604e4f9c2 100644
--- a/modules/gmysqlbackend/Makefile.am
+++ b/modules/gmysqlbackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS += $(MYSQL_CFLAGS)
+AM_CPPFLAGS += $(MYSQL_CFLAGS) $(LIBCRYPTO_INCLUDES)
 
 pkglib_LTLIBRARIES = libgmysqlbackend.la
 
@@ -19,5 +19,5 @@ libgmysqlbackend_la_SOURCES = \
 	gmysqlbackend.cc gmysqlbackend.hh \
 	smysql.cc smysql.hh
 
-libgmysqlbackend_la_LDFLAGS = -module -avoid-version
+libgmysqlbackend_la_LDFLAGS = -module -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS)
 libgmysqlbackend_la_LIBADD = $(MYSQL_LIBS)
diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am
index 4c5de6dcbe..af371faf58 100644
--- a/modules/gsqlite3backend/Makefile.am
+++ b/modules/gsqlite3backend/Makefile.am
@@ -1,5 +1,7 @@
 pkglib_LTLIBRARIES = libgsqlite3backend.la
 
+AM_CPPFLAGS += $(LIBCRYPTO_INCLUDES)
+
 EXTRA_DIST = \
 	OBJECTFILES \
 	OBJECTLIBS
diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am
index 8ecb376cde..7cfd41ad2b 100644
--- a/modules/lmdbbackend/Makefile.am
+++ b/modules/lmdbbackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS += $(LMDB_CFLAGS)
+AM_CPPFLAGS += $(LMDB_CFLAGS) $(LIBCRYPTO_INCLUDES)
 
 pkglib_LTLIBRARIES = liblmdbbackend.la
 
@@ -8,5 +8,5 @@ liblmdbbackend_la_SOURCES = \
 	../../ext/lmdb-safe/lmdb-safe.hh ../../ext/lmdb-safe/lmdb-safe.cc \
 	../../ext/lmdb-safe/lmdb-typed.hh ../../ext/lmdb-safe/lmdb-typed.cc \
 	lmdbbackend.cc lmdbbackend.hh
-liblmdbbackend_la_LDFLAGS = -module -avoid-version
+liblmdbbackend_la_LDFLAGS = -module -avoid-version $(BOOST_SERIALIZATION_LDFLAGS)
 liblmdbbackend_la_LIBADD = $(LMDB_LIBS) $(BOOST_SERIALIZATION_LIBS)
diff --git a/modules/lua2backend/Makefile.am b/modules/lua2backend/Makefile.am
index 3b2477a83e..0a0d6c7b8f 100644
--- a/modules/lua2backend/Makefile.am
+++ b/modules/lua2backend/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS += $(LUA_CFLAGS) \
-	-I$(top_srcdir)/ext/luawrapper/include
+	-I$(top_srcdir)/ext/luawrapper/include \
+	$(LIBCRYPTO_INCLUDES)
 
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
diff --git a/modules/pipebackend/Makefile.am b/modules/pipebackend/Makefile.am
index b91553dbc5..8dbf30dbb8 100644
--- a/modules/pipebackend/Makefile.am
+++ b/modules/pipebackend/Makefile.am
@@ -1,5 +1,7 @@
 pkglib_LTLIBRARIES = libpipebackend.la
 
+AM_CPPFLAGS += $(LIBCRYPTO_INCLUDES)
+
 EXTRA_DIST = \
 	OBJECTFILES \
 	OBJECTLIBS \
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index ec93fadc6f..8d00ff52c6 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -619,6 +619,8 @@ dumresp_SOURCES = \
 	statbag.cc \
 	unix_utility.cc
 
+dumresp_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
+
 kvresp_SOURCES = \
 	dnslabeltext.cc dnsname.cc dnsname.hh \
 	kvresp.cc \