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 59916b05916ade216a4d676492f187fba339e56e..58663f50b900dbcf06ceeebffba60f236a4945bb 100644 (file)
--- 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 a11b31ab2460b5eb1969fa9a0151349e588d2632..f9622206ff86bf137e2ab0b07d9df1893e75d47d 100644 (file)
--- 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 44f1b354edd0ef078706d36f31b98d355ea823b5..4604e4f9c2414f837c8aa28243c8521f21cdd2e3 100644 (file)
--- 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 4c5de6dcbec7b59fa29107651500822d04668c31..af371faf58dcc11352aef368562a69e14b667308 100644 (file)
--- 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 8ecb376cde15eefd3dc7c5c244eaed796ba045ef..7cfd41ad2bb06cb15ccb489c14589286dee1d3b5 100644 (file)
--- 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 3b2477a83efc34df4f9c145eec45f2d797b98608..0a0d6c7b8f686618dafb18d411108ecefb726f98 100644 (file)
--- 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 b91553dbc5fa431809b1d3cfd8c484a1014dc26a..8dbf30dbb8dda26652b1322b8fb7f4a3aff48893 100644 (file)
--- 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 ec93fadc6f3eea8bd49ee1b79a8cf416016c3183..8d00ff52c6131341e01af37bb36b7c15630d8b63 100644 (file)
--- 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 \