[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15443 - in gnunet: . src/hostlist src/nat src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15443 - in gnunet: . src/hostlist src/nat src/transport |
Date: |
Mon, 6 Jun 2011 14:02:42 +0200 |
Author: grothoff
Date: 2011-06-06 14:02:42 +0200 (Mon, 06 Jun 2011)
New Revision: 15443
Modified:
gnunet/configure.ac
gnunet/src/hostlist/Makefile.am
gnunet/src/nat/Makefile.am
gnunet/src/transport/Makefile.am
Log:
fix 1683
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2011-06-06 12:01:09 UTC (rev 15442)
+++ gnunet/configure.ac 2011-06-06 12:02:42 UTC (rev 15443)
@@ -243,19 +243,14 @@
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])
AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am 2011-06-06 12:01:09 UTC (rev 15442)
+++ gnunet/src/hostlist/Makefile.am 2011-06-06 12:02:42 UTC (rev 15443)
@@ -25,7 +25,7 @@
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBMHD) \
- @LIBCURL@ -lcurl \
+ @LIBCURL@ \
$(GN_LIBINTL)
gnunet_daemon_hostlist_CPPFLAGS = \
Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am 2011-06-06 12:01:09 UTC (rev 15442)
+++ gnunet/src/nat/Makefile.am 2011-06-06 12:02:42 UTC (rev 15443)
@@ -28,6 +28,9 @@
@LIBCURL@ \
$(GN_LIBINTL) @EXT_LIBS@
+libgnunetnat_la_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
libgnunetnat_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2011-06-06 12:01:09 UTC (rev 15442)
+++ gnunet/src/transport/Makefile.am 2011-06-06 12:02:42 UTC (rev 15443)
@@ -217,6 +217,10 @@
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 @@
$(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 = \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15443 - in gnunet: . src/hostlist src/nat src/transport,
gnunet <=