fix 1683

diff --git a/configure.ac b/configure.ac
index ab55d0b8b0573cf7462a74019eb0a24df978e933..3a10ba129af54736da1e56eeb34d93dd80afd1e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -243,18 +243,13 @@ AC_RUN_IFELSE(
    fi
   ])
 AC_LANG_POP(C)
+fi     # $build = $target
 
 # libcurl
 LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
-fi     # $build = $target
-
-# glpk
-#AC_CHECK_HEADERS(glpk.h, glpk=true)
-#AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue)
-#AC_CHECK_LIB([glpk],[glp_create_prob])
 
 glpk=true
 AC_CHECK_HEADERS(glpk.h, ,[gplk=false])

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index ec525e2fa1b83a16ee779420d7a15287d282241b..560d8190094d6dbfde6571ea041c1e6cc98d7a3a 100644 (file)
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -25,7 +25,7 @@ gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBMHD) \
-  @LIBCURL@ -lcurl \
+  @LIBCURL@  \
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CPPFLAGS = \

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index a795b56fa768daac225cf0de7822eeae8e2f4f17..fddf61c8da74a85c2dfb4c07fe5a2e59486f39a8 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -28,6 +28,9 @@ libgnunetnat_la_LIBADD = \
   @LIBCURL@ \
   $(GN_LIBINTL) @EXT_LIBS@ 
 
+libgnunetnat_la_CPPFLAGS = \
+  @LIBCURL_CPPFLAGS@
+
 libgnunetnat_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0          

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 71444c4fe7bab3e468e6d00de7368fd0eeefc420..a13cc051856d0c9bdf5c4fd5da55beb441adf824 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -217,6 +217,10 @@ libgnunet_plugin_transport_http_la_LIBADD = \
 libgnunet_plugin_transport_http_la_LDFLAGS = \
  $(GN_LIBMHD) \
  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_https_la_CFLAGS = \
+ $(CFLAGS) 
+libgnunet_plugin_transport_https_la_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
 
 libgnunet_plugin_transport_https_la_SOURCES = \
   plugin_transport_http.c
@@ -230,7 +234,9 @@ libgnunet_plugin_transport_https_la_LDFLAGS = \
  $(GN_LIBMHD) \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_transport_https_la_CFLAGS = \
- $(CFLAGS) -DBUILD_HTTPS  
+ $(CFLAGS) -DBUILD_HTTPS 
+libgnunet_plugin_transport_https_la_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
 
 
 check_PROGRAMS = \