[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23353 - in gnunet: . src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23353 - in gnunet: . src/transport |
Date: |
Wed, 22 Aug 2012 10:13:47 +0200 |
Author: wachs
Date: 2012-08-22 10:13:47 +0200 (Wed, 22 Aug 2012)
New Revision: 23353
Modified:
gnunet/configure.ac
gnunet/src/transport/Makefile.am
Log:
libcurl check
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-08-22 06:34:00 UTC (rev 23352)
+++ gnunet/configure.ac 2012-08-22 08:13:47 UTC (rev 23353)
@@ -326,7 +326,14 @@
fi # $build = $target
# libcurl
-LIBCURL_CHECK_CONFIG(,7.21.3,,AC_MSG_ERROR([GNUnet requires libcurl >=
7.21.3]))
+LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0)
+if test "$curl" = 1
+then
+ AM_CONDITIONAL(HAVE_LIBCURL, true)
+ AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl])
+else
+ AM_CONDITIONAL(HAVE_LIBCURL, false)
+fi
# restore LIBS
LIBS=$SAVE_LIBS
@@ -1123,6 +1130,12 @@
AC_MSG_NOTICE([NOTICE: sqlite not found. sqLite support will not be
compiled.])
fi
+# libcurl
+if test "x$curl" = "x0"
+then
+ AC_MSG_NOTICE([NOTICE: libcurl not found. http client support will not be
compiled.])
+fi
+
#gnutls
if test x$gnutls != xtrue
then
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2012-08-22 06:34:00 UTC (rev 23352)
+++ gnunet/src/transport/Makefile.am 2012-08-22 08:13:47 UTC (rev 23353)
@@ -14,10 +14,11 @@
HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la
endif
-HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
-HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
+if HAVE_LIBCURL
+ HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
+ HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
+endif
-
if FALSE
HTTP_API_TEST = test_transport_api_http
HTTP_NAT_API_TEST = test_transport_api_http_nat
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23353 - in gnunet: . src/transport,
gnunet <=