Fix linking with WebKit trunk

We forgot to link to nettle and hogweed. It only worked because WebKit
was pulling them in via GnuTLS, but WebKit has now switched to gcrypt.

Also, use the pkg-config variables in the proper place in tests.

5 files changed, 29 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 4b99e8e18..c3ed2e31f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,7 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_REQUIRED])
 PKG_CHECK_MODULES([GNOME_DESKTOP], [gnome-desktop-3.0 >= 2.91.2])
 PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK_REQUIRED])
 PKG_CHECK_MODULES([GTK_UNIX_PRINT], [gtk+-unix-print-3.0 >= $GTK_REQUIRED])
+PKG_CHECK_MODULES([HOGWEED], [hogweed >= 3.2])
 PKG_CHECK_MODULES([HTTPSEVERYWHERE], [httpseverywhere-0.2 >= 0.2.2])
 PKG_CHECK_MODULES([JSON_GLIB], [json-glib-1.0 >= 1.2.0])
 PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.5.1])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6310e628a..f3d4058f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,11 +99,13 @@ libephymain_la_CPPFLAGS = \
 	$(GIO_CFLAGS)			\
 	$(GLIB_CFLAGS)			\
 	$(GTK_CFLAGS)			\
+	$(HOGWEED_CFLAGS)		\
 	$(JSON_GLIB_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)		\
 	$(LIBSECRET_CFLAGS)		\
 	$(LIBSOUP_CFLAGS)		\
 	$(LIBXML_CFLAGS)		\
+	$(NETTLE_CFLAGS)		\
 	$(WEBKIT2GTK_CFLAGS)
 
 libephymain_la_CFLAGS = \
@@ -122,11 +124,13 @@ libephymain_la_LIBADD = \
 	$(GIO_LIBS)		\
 	$(GLIB_LIBS)		\
 	$(GTK_LIBS)		\
+	$(HOGWEED_LIBS)		\
 	$(JSON_GLIB_LIBS)	\
 	$(LIBNOTIFY_LIBS)	\
 	$(LIBSECRET_LIBS)	\
 	$(LIBSOUP_LIBS)		\
 	$(LIBXML_LIBS)		\
+	$(NETTLE_LIBS)		\
 	$(WEBKIT2GTK_LIBS)
 
 RESOURCE_FILES = \
@@ -196,9 +200,11 @@ epiphany_CPPFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\"	\
 	$(GLIB_CFLAGS)			\
 	$(GTK_CFLAGS)			\
+	$(HOGWEED_CFLAGS)		\
 	$(JSON_GLIB_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)		\
 	$(LIBXML_CFLAGS)		\
+	$(NETTLE_CFLAGS)		\
 	$(WEBKIT2GTK_CFLAGS)
 
 epiphany_LDADD = \
@@ -206,9 +212,11 @@ epiphany_LDADD = \
 	libephymain.la		\
 	$(GLIB_LIBS)		\
 	$(GTK_LIBS)		\
+	$(HOGWEED_LIBS)		\
 	$(JSON_GLIB_LIBS)	\
 	$(LIBNOTIFY_LIBS)	\
 	$(LIBXML_LIBS)		\
+	$(NETTLE_LIBS)		\
 	$(WEBKIT2GTK_LIBS)
 
 epiphany_LDFLAGS = \
diff --git a/src/profile-migrator/Makefile.am b/src/profile-migrator/Makefile.am
index aef6f2687..8cf59bd4a 100644
--- a/src/profile-migrator/Makefile.am
+++ b/src/profile-migrator/Makefile.am
@@ -17,10 +17,12 @@ ephy_profile_migrator_CPPFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\"			\
 	$(GLIB_CFLAGS)					\
 	$(GTK_CFLAGS)					\
+	$(HOGWEED_CFLAGS)				\
 	$(JSON_GLIB_CFLAGS)				\
 	$(LIBSECRET_CFLAGS)				\
 	$(LIBSOUP_CFLAGS)				\
 	$(LIBXML_CFLAGS)				\
+	$(NETTLE_CFLAGS)				\
 	$(WEBKIT2GTK_CFLAGS)
 
 ephy_profile_migrator_LDADD = \
@@ -28,10 +30,12 @@ ephy_profile_migrator_LDADD = \
 	$(top_builddir)/src/libephymain.la	\
 	$(GLIB_LIBS)				\
 	$(GTK_LIBS)				\
+	$(HOGWEED_LIBS)				\
 	$(JSON_GLIB_LIBS)			\
 	$(LIBSECRET_LIBS)			\
 	$(LIBSOUP_LIBS)				\
 	$(LIBXML_LIBS)				\
+	$(NETTLE_LIBS)				\
 	$(WEBKIT2GTK_LIBS)
 
 ephy_profile_migrator_LDFLAGS = \
diff --git a/src/search-provider/Makefile.am b/src/search-provider/Makefile.am
index 2d6089eaf..814152716 100644
--- a/src/search-provider/Makefile.am
+++ b/src/search-provider/Makefile.am
@@ -30,10 +30,12 @@ epiphany_search_provider_CPPFLAGS = \
 	$(GIO_CFLAGS)			\
 	$(GLIB_CFLAGS)			\
 	$(GTK_CFLAGS)			\
+	$(HOGWEED_CFLAGS)		\
 	$(JSON_GLIB_CFLAGS)		\
 	$(LIBSECRET_CFLAGS)		\
 	$(LIBSOUP_CFLAGS)		\
 	$(LIBXML_CFLAGS)		\
+	$(NETTLE_CFLAGS)		\
 	$(WEBKIT2GTK_CFLAGS)
 
 epiphany_search_provider_LDADD = \
@@ -42,10 +44,12 @@ epiphany_search_provider_LDADD = \
 	$(GIO_LIBS)		\
 	$(GLIB_LIBS)		\
 	$(GTK_LIBS)		\
+	$(HOGWEED_LIBS)		\
 	$(JSON_GLIB_LIBS)	\
 	$(LIBSECRET_LIBS)	\
 	$(LIBSOUP_LIBS)		\
 	$(LIBXML_LIBS)		\
+	$(NETTLE_LIBS)		\
 	$(WEBKIT2GTK_LIBS)
 
 epiphany_search_provider_LDFLAGS = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 41ef88ab9..44b962cee 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -95,20 +95,20 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src		\
 	-I$(top_srcdir)/src/bookmarks	\
 	-I$(top_srcdir)/src/sync	\
-	-DTEST_DIR=\"$(srcdir)\"
+	-DTEST_DIR=\"$(srcdir)\"	\
+	$(GDK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	$(HOGWEED_CFLAGS)		\
+	$(JSON_GLIB_CFLAGS)		\
+	$(LIBSOUP_CFLAGS)		\
+	$(NETTLE_CFLAGS)		\
+	$(WEBKIT2GTK_CFLAGS)
 
 AM_CFLAGS = \
-	$(CODE_COVERAGE_CFLAGS) \
-	$(GDK_CFLAGS)		\
-	$(GLIB_CFLAGS)		\
-	$(GTK_CFLAGS)		\
-	$(JSON_GLIB_CFLAGS)	\
-	$(LIBSOUP_CFLAGS)	\
-	$(WARN_CFLAGS)		\
-	$(WEBKIT2GTK_CFLAGS)
+	$(WARN_CFLAGS)
 
 AM_LDFLAGS = \
-	$(CODE_COVERAGE_LDFLAGS) \
 	$(WARN_LDFLAGS)
 
 LDADD = \
@@ -117,8 +117,10 @@ LDADD = \
 	$(GDK_LIBS)		\
 	$(GLIB_LIBS)		\
 	$(GTK_LIBS)		\
+	$(HOGWEED_LIBS)		\
 	$(JSON_GLIB_LIBS)	\
 	$(LIBSOUP_LIBS)		\
+	$(NETTLE_LIBS)		\
 	$(WEBKIT2GTK_LIBS)
 
 test_ephy_completion_model_SOURCES = \