diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/Makefile.in gnunet-0.10.1/Makefile.in
--- gnunet-0.10.1.orig/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/Makefile.in	2015-05-28 06:38:17.732420500 +0300
@@ -297,8 +297,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/configure.ac gnunet-0.10.1/configure.ac
--- gnunet-0.10.1.orig/configure.ac	2014-04-08 10:55:04.000000000 +0300
+++ gnunet-0.10.1/configure.ac	2015-05-28 06:39:00.516813336 +0300
@@ -453,15 +453,9 @@
 fi
 
 # libgnurl
-LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
-if test "$gnurl" = 1
-then
-	AM_CONDITIONAL(HAVE_LIBGNURL, true)
-	AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
-else
-	AM_CONDITIONAL(HAVE_LIBGNURL, false)
-fi
-
+$gnurl=yes
+AM_CONDITIONAL(HAVE_LIBGNURL, true)
+AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
 
 # libidn
 AC_MSG_CHECKING([if Libidn can be used])
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/contrib/Makefile.in gnunet-0.10.1/contrib/Makefile.in
--- gnunet-0.10.1.orig/contrib/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/contrib/Makefile.in	2015-05-28 06:38:17.675421309 +0300
@@ -453,8 +453,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/doc/Makefile.in gnunet-0.10.1/doc/Makefile.in
--- gnunet-0.10.1.orig/doc/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/doc/Makefile.in	2015-05-28 06:38:17.749420259 +0300
@@ -239,8 +239,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/doc/doxygen/Makefile.in gnunet-0.10.1/doc/doxygen/Makefile.in
--- gnunet-0.10.1.orig/doc/doxygen/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/doc/doxygen/Makefile.in	2015-05-28 06:38:17.762420074 +0300
@@ -179,8 +179,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/doc/man/Makefile.in gnunet-0.10.1/doc/man/Makefile.in
--- gnunet-0.10.1.orig/doc/man/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/doc/man/Makefile.in	2015-05-28 06:38:17.776419875 +0300
@@ -211,8 +211,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/m4/Makefile.in gnunet-0.10.1/m4/Makefile.in
--- gnunet-0.10.1.orig/m4/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/m4/Makefile.in	2015-05-28 06:38:17.699420968 +0300
@@ -179,8 +179,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/m4/libgnurl.m4 gnunet-0.10.1/m4/libgnurl.m4
--- gnunet-0.10.1.orig/m4/libgnurl.m4	2013-11-04 13:07:22.000000000 +0300
+++ gnunet-0.10.1/m4/libgnurl.m4	2015-05-28 06:38:17.684421181 +0300
@@ -14,7 +14,7 @@
 # Note that using --without-libgnurl does run ACTION-IF-NO.
 #
 # This macro #defines HAVE_LIBGNURL if a working libgnurl setup is
-# found, and sets @LIBGNURL@ and @LIBGNURL_CPPFLAGS@ to the necessary
+# found, and sets $(LIBGNURL) and $(LIBGNURL_CPPFLAGS) to the necessary
 # values.  Other useful defines are LIBGNURL_FEATURE_xxx where xxx are
 # the various features supported by libgnurl, and LIBGNURL_PROTOCOL_yyy
 # where yyy are the various protocols supported by libgnurl.  Both xxx
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/pkgconfig/Makefile.in gnunet-0.10.1/pkgconfig/Makefile.in
--- gnunet-0.10.1.orig/pkgconfig/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/pkgconfig/Makefile.in	2015-05-28 06:38:19.246399014 +0300
@@ -243,8 +243,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/Makefile.in gnunet-0.10.1/src/Makefile.in
--- gnunet-0.10.1.orig/src/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/src/Makefile.in	2015-05-28 06:38:18.406410935 +0300
@@ -250,8 +250,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/arm/Makefile.in gnunet-0.10.1/src/arm/Makefile.in
--- gnunet-0.10.1.orig/src/arm/Makefile.in	2014-04-08 13:49:19.000000000 +0300
+++ gnunet-0.10.1/src/arm/Makefile.in	2015-05-28 06:38:18.108415164 +0300
@@ -485,8 +485,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/ats/Makefile.in gnunet-0.10.1/src/ats/Makefile.in
--- gnunet-0.10.1.orig/src/ats/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/ats/Makefile.in	2015-05-28 06:38:18.183414099 +0300
@@ -962,8 +962,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/ats-tests/Makefile.in gnunet-0.10.1/src/ats-tests/Makefile.in
--- gnunet-0.10.1.orig/src/ats-tests/Makefile.in	2014-04-08 13:52:42.000000000 +0300
+++ gnunet-0.10.1/src/ats-tests/Makefile.in	2015-05-28 06:38:18.718406507 +0300
@@ -532,8 +532,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/ats-tool/Makefile.in gnunet-0.10.1/src/ats-tool/Makefile.in
--- gnunet-0.10.1.orig/src/ats-tool/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/ats-tool/Makefile.in	2015-05-28 06:38:19.011402349 +0300
@@ -236,8 +236,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/block/Makefile.in gnunet-0.10.1/src/block/Makefile.in
--- gnunet-0.10.1.orig/src/block/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/block/Makefile.in	2015-05-28 06:38:18.764405854 +0300
@@ -280,8 +280,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/consensus/Makefile.in gnunet-0.10.1/src/consensus/Makefile.in
--- gnunet-0.10.1.orig/src/consensus/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/consensus/Makefile.in	2015-05-28 06:38:18.998402533 +0300
@@ -485,8 +485,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/conversation/Makefile.in gnunet-0.10.1/src/conversation/Makefile.in
--- gnunet-0.10.1.orig/src/conversation/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/conversation/Makefile.in	2015-05-28 06:38:18.007416597 +0300
@@ -667,8 +667,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/core/Makefile.in gnunet-0.10.1/src/core/Makefile.in
--- gnunet-0.10.1.orig/src/core/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/core/Makefile.in	2015-05-28 06:38:18.476409941 +0300
@@ -550,8 +550,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datacache/Makefile.in gnunet-0.10.1/src/datacache/Makefile.in
--- gnunet-0.10.1.orig/src/datacache/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/datacache/Makefile.in	2015-05-28 06:38:19.055401724 +0300
@@ -600,8 +600,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datastore/Makefile.in gnunet-0.10.1/src/datastore/Makefile.in
--- gnunet-0.10.1.orig/src/datastore/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/datastore/Makefile.in	2015-05-28 06:38:18.852404605 +0300
@@ -750,8 +750,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/dht/Makefile.in gnunet-0.10.1/src/dht/Makefile.in
--- gnunet-0.10.1.orig/src/dht/Makefile.in	2014-04-08 13:49:20.000000000 +0300
+++ gnunet-0.10.1/src/dht/Makefile.in	2015-05-28 06:38:19.199399681 +0300
@@ -554,8 +554,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/dns/Makefile.in gnunet-0.10.1/src/dns/Makefile.in
--- gnunet-0.10.1.orig/src/dns/Makefile.in	2014-04-08 13:49:21.000000000 +0300
+++ gnunet-0.10.1/src/dns/Makefile.in	2015-05-28 06:38:19.171400078 +0300
@@ -493,8 +493,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/dv/Makefile.in gnunet-0.10.1/src/dv/Makefile.in
--- gnunet-0.10.1.orig/src/dv/Makefile.in	2014-04-08 13:49:21.000000000 +0300
+++ gnunet-0.10.1/src/dv/Makefile.in	2015-05-28 06:38:19.106401000 +0300
@@ -496,8 +496,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/env/Makefile.in gnunet-0.10.1/src/env/Makefile.in
--- gnunet-0.10.1.orig/src/env/Makefile.in	2014-04-08 13:49:21.000000000 +0300
+++ gnunet-0.10.1/src/env/Makefile.in	2015-05-28 06:38:19.145400447 +0300
@@ -441,8 +441,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/exit/Makefile.in gnunet-0.10.1/src/exit/Makefile.in
--- gnunet-0.10.1.orig/src/exit/Makefile.in	2014-04-08 13:49:21.000000000 +0300
+++ gnunet-0.10.1/src/exit/Makefile.in	2015-05-28 06:38:19.025402150 +0300
@@ -284,8 +284,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/experimentation/Makefile.in gnunet-0.10.1/src/experimentation/Makefile.in
--- gnunet-0.10.1.orig/src/experimentation/Makefile.in	2014-04-08 13:49:21.000000000 +0300
+++ gnunet-0.10.1/src/experimentation/Makefile.in	2015-05-28 06:38:18.586408380 +0300
@@ -472,8 +472,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/fragmentation/Makefile.in gnunet-0.10.1/src/fragmentation/Makefile.in
--- gnunet-0.10.1.orig/src/fragmentation/Makefile.in	2014-04-08 13:49:21.000000000 +0300
+++ gnunet-0.10.1/src/fragmentation/Makefile.in	2015-05-28 06:38:18.904403867 +0300
@@ -452,8 +452,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/fs/Makefile.in gnunet-0.10.1/src/fs/Makefile.in
--- gnunet-0.10.1.orig/src/fs/Makefile.in	2014-04-08 14:16:58.000000000 +0300
+++ gnunet-0.10.1/src/fs/Makefile.in	2015-05-28 06:38:18.650407472 +0300
@@ -838,8 +838,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/gns/Makefile.in gnunet-0.10.1/src/gns/Makefile.in
--- gnunet-0.10.1.orig/src/gns/Makefile.in	2014-04-08 13:49:21.000000000 +0300
+++ gnunet-0.10.1/src/gns/Makefile.in	2015-05-28 06:38:18.246413205 +0300
@@ -568,8 +568,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/gns/nss/Makefile.in gnunet-0.10.1/src/gns/nss/Makefile.in
--- gnunet-0.10.1.orig/src/gns/nss/Makefile.in	2014-04-08 13:49:21.000000000 +0300
+++ gnunet-0.10.1/src/gns/nss/Makefile.in	2015-05-28 06:38:18.263412964 +0300
@@ -306,8 +306,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/gnsrecord/Makefile.in gnunet-0.10.1/src/gnsrecord/Makefile.in
--- gnunet-0.10.1.orig/src/gnsrecord/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/gnsrecord/Makefile.in	2015-05-28 06:38:18.366411502 +0300
@@ -490,8 +490,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/hello/Makefile.in gnunet-0.10.1/src/hello/Makefile.in
--- gnunet-0.10.1.orig/src/hello/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/hello/Makefile.in	2015-05-28 06:38:18.735406266 +0300
@@ -458,8 +458,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/hostlist/Makefile.am gnunet-0.10.1/src/hostlist/Makefile.am
--- gnunet-0.10.1.orig/src/hostlist/Makefile.am	2014-04-08 13:45:36.000000000 +0300
+++ gnunet-0.10.1/src/hostlist/Makefile.am	2015-05-28 06:38:18.211413702 +0300
@@ -34,11 +34,11 @@
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBMHD) \
-  @LIBGNURL@  \
+  $(LIBGNURL)  \
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@  $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS)  $(AM_CPPFLAGS)
 
 if HAVE_LIBGNURL
 check_PROGRAMS = \
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/hostlist/Makefile.in gnunet-0.10.1/src/hostlist/Makefile.in
--- gnunet-0.10.1.orig/src/hostlist/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/hostlist/Makefile.in	2015-05-28 06:38:18.208413745 +0300
@@ -490,8 +490,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
@@ -649,11 +649,11 @@
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBMHD) \
-  @LIBGNURL@  \
+  $(LIBGNURL)  \
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@  $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS)  $(AM_CPPFLAGS)
 
 @ENABLE_TEST_RUN_TRUE@@HAVE_LIBGNURL_TRUE@@HAVE_MHD_TRUE@AM_TESTS_ENVIRONMENT = export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 test_gnunet_daemon_hostlist_SOURCES = \
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/identity/Makefile.in gnunet-0.10.1/src/identity/Makefile.in
--- gnunet-0.10.1.orig/src/identity/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/identity/Makefile.in	2015-05-28 06:38:18.451410296 +0300
@@ -463,8 +463,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/include/Makefile.in gnunet-0.10.1/src/include/Makefile.in
--- gnunet-0.10.1.orig/src/include/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/include/Makefile.in	2015-05-28 06:38:18.663407287 +0300
@@ -308,8 +308,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/integration-tests/Makefile.in gnunet-0.10.1/src/integration-tests/Makefile.in
--- gnunet-0.10.1.orig/src/integration-tests/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/integration-tests/Makefile.in	2015-05-28 06:38:19.124400745 +0300
@@ -386,8 +386,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/mesh/Makefile.in gnunet-0.10.1/src/mesh/Makefile.in
--- gnunet-0.10.1.orig/src/mesh/Makefile.in	2014-04-08 14:16:37.000000000 +0300
+++ gnunet-0.10.1/src/mesh/Makefile.in	2015-05-28 06:38:18.332411985 +0300
@@ -539,8 +539,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/multicast/Makefile.in gnunet-0.10.1/src/multicast/Makefile.in
--- gnunet-0.10.1.orig/src/multicast/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/multicast/Makefile.in	2015-05-28 06:38:18.930403498 +0300
@@ -471,8 +471,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/mysql/Makefile.in gnunet-0.10.1/src/mysql/Makefile.in
--- gnunet-0.10.1.orig/src/mysql/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/mysql/Makefile.in	2015-05-28 06:38:18.346411786 +0300
@@ -264,8 +264,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/namecache/Makefile.in gnunet-0.10.1/src/namecache/Makefile.in
--- gnunet-0.10.1.orig/src/namecache/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/namecache/Makefile.in	2015-05-28 06:38:18.133414809 +0300
@@ -520,8 +520,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/namestore/Makefile.in gnunet-0.10.1/src/namestore/Makefile.in
--- gnunet-0.10.1.orig/src/namestore/Makefile.in	2014-04-08 13:49:22.000000000 +0300
+++ gnunet-0.10.1/src/namestore/Makefile.in	2015-05-28 06:38:18.300412439 +0300
@@ -704,8 +704,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/nat/Makefile.in gnunet-0.10.1/src/nat/Makefile.in
--- gnunet-0.10.1.orig/src/nat/Makefile.in	2014-04-08 14:20:52.000000000 +0300
+++ gnunet-0.10.1/src/nat/Makefile.in	2015-05-28 06:38:17.800419535 +0300
@@ -499,8 +499,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/nse/Makefile.in gnunet-0.10.1/src/nse/Makefile.in
--- gnunet-0.10.1.orig/src/nse/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/nse/Makefile.in	2015-05-28 06:38:17.926417747 +0300
@@ -490,8 +490,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/peerinfo/Makefile.in gnunet-0.10.1/src/peerinfo/Makefile.in
--- gnunet-0.10.1.orig/src/peerinfo/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/peerinfo/Makefile.in	2015-05-28 06:38:18.682407018 +0300
@@ -516,8 +516,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/peerinfo-tool/Makefile.in gnunet-0.10.1/src/peerinfo-tool/Makefile.in
--- gnunet-0.10.1.orig/src/peerinfo-tool/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/peerinfo-tool/Makefile.in	2015-05-28 06:38:18.973402888 +0300
@@ -442,8 +442,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/postgres/Makefile.in gnunet-0.10.1/src/postgres/Makefile.in
--- gnunet-0.10.1.orig/src/postgres/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/postgres/Makefile.in	2015-05-28 06:38:18.081415547 +0300
@@ -263,8 +263,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/psyc/Makefile.in gnunet-0.10.1/src/psyc/Makefile.in
--- gnunet-0.10.1.orig/src/psyc/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/psyc/Makefile.in	2015-05-28 06:38:18.882404179 +0300
@@ -459,8 +459,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/psycstore/Makefile.in gnunet-0.10.1/src/psycstore/Makefile.in
--- gnunet-0.10.1.orig/src/psycstore/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/psycstore/Makefile.in	2015-05-28 06:38:18.789405499 +0300
@@ -482,8 +482,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/pt/Makefile.am gnunet-0.10.1/src/pt/Makefile.am
--- gnunet-0.10.1.orig/src/pt/Makefile.am	2014-04-08 13:45:35.000000000 +0300
+++ gnunet-0.10.1/src/pt/Makefile.am	2015-05-28 06:38:18.390411162 +0300
@@ -69,48 +69,48 @@
 
 test_gns_vpn_SOURCES = \
  test_gns_vpn.c
-test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gns_vpn_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gns_vpn_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gnunet_vpn_4_over_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gnunet_vpn_6_over_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gnunet_vpn_4_to_6_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gnunet_vpn_6_to_4_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/pt/Makefile.in gnunet-0.10.1/src/pt/Makefile.in
--- gnunet-0.10.1.orig/src/pt/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/pt/Makefile.in	2015-05-28 06:38:18.388411190 +0300
@@ -500,8 +500,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
@@ -681,58 +681,58 @@
 test_gns_vpn_SOURCES = \
  test_gns_vpn.c
 
-test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gns_vpn_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gns_vpn_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
 
-test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_vpn_4_over_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
 
-test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_vpn_6_over_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
 
-test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_vpn_4_to_6_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
 
-test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIBGNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_vpn_6_to_4_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 all: all-am
 
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/regex/Makefile.in gnunet-0.10.1/src/regex/Makefile.in
--- gnunet-0.10.1.orig/src/regex/Makefile.in	2014-04-08 14:20:54.000000000 +0300
+++ gnunet-0.10.1/src/regex/Makefile.in	2015-05-28 06:38:19.230399241 +0300
@@ -562,8 +562,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/revocation/Makefile.in gnunet-0.10.1/src/revocation/Makefile.in
--- gnunet-0.10.1.orig/src/revocation/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/revocation/Makefile.in	2015-05-28 06:38:18.559408763 +0300
@@ -475,8 +475,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/scalarproduct/Makefile.in gnunet-0.10.1/src/scalarproduct/Makefile.in
--- gnunet-0.10.1.orig/src/scalarproduct/Makefile.in	2014-04-08 13:49:23.000000000 +0300
+++ gnunet-0.10.1/src/scalarproduct/Makefile.in	2015-05-28 06:38:17.971417108 +0300
@@ -288,8 +288,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/secretsharing/Makefile.in gnunet-0.10.1/src/secretsharing/Makefile.in
--- gnunet-0.10.1.orig/src/secretsharing/Makefile.in	2014-04-08 13:49:24.000000000 +0300
+++ gnunet-0.10.1/src/secretsharing/Makefile.in	2015-05-28 06:38:17.952417378 +0300
@@ -476,8 +476,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/set/Makefile.in gnunet-0.10.1/src/set/Makefile.in
--- gnunet-0.10.1.orig/src/set/Makefile.in	2014-04-08 13:49:24.000000000 +0300
+++ gnunet-0.10.1/src/set/Makefile.in	2015-05-28 06:38:18.611408025 +0300
@@ -492,8 +492,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/statistics/Makefile.in gnunet-0.10.1/src/statistics/Makefile.in
--- gnunet-0.10.1.orig/src/statistics/Makefile.in	2014-04-08 14:20:51.000000000 +0300
+++ gnunet-0.10.1/src/statistics/Makefile.in	2015-05-28 06:38:18.500409601 +0300
@@ -495,8 +495,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/template/Makefile.in gnunet-0.10.1/src/template/Makefile.in
--- gnunet-0.10.1.orig/src/template/Makefile.in	2014-04-08 13:49:24.000000000 +0300
+++ gnunet-0.10.1/src/template/Makefile.in	2015-05-28 06:38:18.815405130 +0300
@@ -457,8 +457,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/testbed/Makefile.in gnunet-0.10.1/src/testbed/Makefile.in
--- gnunet-0.10.1.orig/src/testbed/Makefile.in	2014-04-08 13:49:24.000000000 +0300
+++ gnunet-0.10.1/src/testbed/Makefile.in	2015-05-28 06:38:18.539409047 +0300
@@ -826,8 +826,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/testing/Makefile.in gnunet-0.10.1/src/testing/Makefile.in
--- gnunet-0.10.1.orig/src/testing/Makefile.in	2014-04-08 13:49:24.000000000 +0300
+++ gnunet-0.10.1/src/testing/Makefile.in	2015-05-28 06:38:18.432410566 +0300
@@ -510,8 +510,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/topology/Makefile.in gnunet-0.10.1/src/topology/Makefile.in
--- gnunet-0.10.1.orig/src/topology/Makefile.in	2014-04-08 13:49:24.000000000 +0300
+++ gnunet-0.10.1/src/topology/Makefile.in	2015-05-28 06:38:18.952403186 +0300
@@ -471,8 +471,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/transport/Makefile.am gnunet-0.10.1/src/transport/Makefile.am
--- gnunet-0.10.1.orig/src/transport/Makefile.am	2014-04-08 14:13:31.000000000 +0300
+++ gnunet-0.10.1/src/transport/Makefile.am	2015-05-28 06:38:17.898418144 +0300
@@ -319,7 +319,7 @@
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  @LIBGNURL@ \
+  $(LIBGNURL) \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_http_client_la_LDFLAGS = \
@@ -327,7 +327,7 @@
 libgnunet_plugin_transport_http_client_la_CFLAGS = \
  $(CFLAGS)
 libgnunet_plugin_transport_http_client_la_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_http_server_la_SOURCES = \
@@ -350,7 +350,7 @@
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  @LIBGNURL@ \
+  $(LIBGNURL) \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_https_client_la_LDFLAGS = \
@@ -358,7 +358,7 @@
 libgnunet_plugin_transport_https_client_la_CFLAGS = \
  $(CFLAGS) -DBUILD_HTTPS
 libgnunet_plugin_transport_https_client_la_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_https_server_la_SOURCES = \
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/transport/Makefile.in gnunet-0.10.1/src/transport/Makefile.in
--- gnunet-0.10.1.orig/src/transport/Makefile.in	2014-04-08 14:16:08.000000000 +0300
+++ gnunet-0.10.1/src/transport/Makefile.in	2015-05-28 06:38:17.880418399 +0300
@@ -1677,8 +1677,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
@@ -2096,7 +2096,7 @@
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  @LIBGNURL@ \
+  $(LIBGNURL) \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -2107,7 +2107,7 @@
  $(CFLAGS)
 
 libgnunet_plugin_transport_http_client_la_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 libgnunet_plugin_transport_http_server_la_SOURCES = \
   plugin_transport_http_server.c plugin_transport_http_common.c
@@ -2133,7 +2133,7 @@
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  @LIBGNURL@ \
+  $(LIBGNURL) \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -2144,7 +2144,7 @@
  $(CFLAGS) -DBUILD_HTTPS
 
 libgnunet_plugin_transport_https_client_la_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS)
 
 libgnunet_plugin_transport_https_server_la_SOURCES = \
   plugin_transport_http_server.c plugin_transport_http_common.c
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/tun/Makefile.in gnunet-0.10.1/src/tun/Makefile.in
--- gnunet-0.10.1.orig/src/tun/Makefile.in	2014-04-08 13:49:25.000000000 +0300
+++ gnunet-0.10.1/src/tun/Makefile.in	2015-05-28 06:38:19.078401398 +0300
@@ -452,8 +452,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/util/Makefile.in gnunet-0.10.1/src/util/Makefile.in
--- gnunet-0.10.1.orig/src/util/Makefile.in	2014-04-08 14:15:39.000000000 +0300
+++ gnunet-0.10.1/src/util/Makefile.in	2015-05-28 06:38:18.070415703 +0300
@@ -867,8 +867,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/vpn/Makefile.in gnunet-0.10.1/src/vpn/Makefile.in
--- gnunet-0.10.1.orig/src/vpn/Makefile.in	2014-04-08 13:49:25.000000000 +0300
+++ gnunet-0.10.1/src/vpn/Makefile.in	2015-05-28 06:38:18.749406067 +0300
@@ -303,8 +303,8 @@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBGNURL = @LIBGNURL@
-LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@
+LIBGNURL = $(LIBGNURL)
+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS)
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@