diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-06 12:02:42 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-06 12:02:42 +0000 |
commit | 9df1b22701df956d83e267f8dc3038e158ef9f08 (patch) | |
tree | 47b42a924d5d6f0a1f60bff9ab75dc63e1e64f63 | |
parent | cf5339b80c7b2984aa18ff4908173c83efeef6a1 (diff) | |
download | gnunet-9df1b22701df956d83e267f8dc3038e158ef9f08.tar.gz gnunet-9df1b22701df956d83e267f8dc3038e158ef9f08.zip |
fix 1683
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | src/hostlist/Makefile.am | 2 | ||||
-rw-r--r-- | src/nat/Makefile.am | 3 | ||||
-rw-r--r-- | 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( | |||
243 | fi | 243 | fi |
244 | ]) | 244 | ]) |
245 | AC_LANG_POP(C) | 245 | AC_LANG_POP(C) |
246 | fi # $build = $target | ||
246 | 247 | ||
247 | # libcurl | 248 | # libcurl |
248 | LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1])) | 249 | LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1])) |
249 | # restore LIBS | 250 | # restore LIBS |
250 | LIBS=$SAVE_LIBS | 251 | LIBS=$SAVE_LIBS |
251 | 252 | ||
252 | fi # $build = $target | ||
253 | |||
254 | # glpk | ||
255 | #AC_CHECK_HEADERS(glpk.h, glpk=true) | ||
256 | #AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue) | ||
257 | #AC_CHECK_LIB([glpk],[glp_create_prob]) | ||
258 | 253 | ||
259 | glpk=true | 254 | glpk=true |
260 | AC_CHECK_HEADERS(glpk.h, ,[gplk=false]) | 255 | 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 = \ | |||
25 | $(top_builddir)/src/transport/libgnunettransport.la \ | 25 | $(top_builddir)/src/transport/libgnunettransport.la \ |
26 | $(top_builddir)/src/util/libgnunetutil.la \ | 26 | $(top_builddir)/src/util/libgnunetutil.la \ |
27 | $(GN_LIBMHD) \ | 27 | $(GN_LIBMHD) \ |
28 | @LIBCURL@ -lcurl \ | 28 | @LIBCURL@ \ |
29 | $(GN_LIBINTL) | 29 | $(GN_LIBINTL) |
30 | 30 | ||
31 | gnunet_daemon_hostlist_CPPFLAGS = \ | 31 | 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 = \ | |||
28 | @LIBCURL@ \ | 28 | @LIBCURL@ \ |
29 | $(GN_LIBINTL) @EXT_LIBS@ | 29 | $(GN_LIBINTL) @EXT_LIBS@ |
30 | 30 | ||
31 | libgnunetnat_la_CPPFLAGS = \ | ||
32 | @LIBCURL_CPPFLAGS@ | ||
33 | |||
31 | libgnunetnat_la_LDFLAGS = \ | 34 | libgnunetnat_la_LDFLAGS = \ |
32 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 35 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
33 | -version-info 0:0:0 | 36 | -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 = \ | |||
217 | libgnunet_plugin_transport_http_la_LDFLAGS = \ | 217 | libgnunet_plugin_transport_http_la_LDFLAGS = \ |
218 | $(GN_LIBMHD) \ | 218 | $(GN_LIBMHD) \ |
219 | $(GN_PLUGIN_LDFLAGS) | 219 | $(GN_PLUGIN_LDFLAGS) |
220 | libgnunet_plugin_transport_https_la_CFLAGS = \ | ||
221 | $(CFLAGS) | ||
222 | libgnunet_plugin_transport_https_la_CPPFLAGS = \ | ||
223 | @LIBCURL_CPPFLAGS@ | ||
220 | 224 | ||
221 | libgnunet_plugin_transport_https_la_SOURCES = \ | 225 | libgnunet_plugin_transport_https_la_SOURCES = \ |
222 | plugin_transport_http.c | 226 | plugin_transport_http.c |
@@ -230,7 +234,9 @@ libgnunet_plugin_transport_https_la_LDFLAGS = \ | |||
230 | $(GN_LIBMHD) \ | 234 | $(GN_LIBMHD) \ |
231 | $(GN_PLUGIN_LDFLAGS) | 235 | $(GN_PLUGIN_LDFLAGS) |
232 | libgnunet_plugin_transport_https_la_CFLAGS = \ | 236 | libgnunet_plugin_transport_https_la_CFLAGS = \ |
233 | $(CFLAGS) -DBUILD_HTTPS | 237 | $(CFLAGS) -DBUILD_HTTPS |
238 | libgnunet_plugin_transport_https_la_CPPFLAGS = \ | ||
239 | @LIBCURL_CPPFLAGS@ | ||
234 | 240 | ||
235 | 241 | ||
236 | check_PROGRAMS = \ | 242 | check_PROGRAMS = \ |