From 9df1b22701df956d83e267f8dc3038e158ef9f08 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 6 Jun 2011 12:02:42 +0000
Subject: fix 1683

---
 configure.ac              | 7 +------
 src/hostlist/Makefile.am  | 2 +-
 src/nat/Makefile.am       | 3 +++
 src/transport/Makefile.am | 8 +++++++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index ab55d0b8b..3a10ba129 100644
--- 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 ec525e2fa..560d81900 100644
--- 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 a795b56fa..fddf61c8d 100644
--- 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 71444c4fe..a13cc0518 100644
--- 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 = \
-- 
cgit v1.2.3