[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32564 - in libmicrohttpd: . src/examples src/microhttpd sr
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r32564 - in libmicrohttpd: . src/examples src/microhttpd src/spdy2http src/testcurl src/testcurl/https src/testspdy src/testzzuf |
|
Date: |
Thu, 6 Mar 2014 11:50:53 +0100 |
Author: Karlson2k
Date: 2014-03-06 11:50:52 +0100 (Thu, 06 Mar 2014)
New Revision: 32564
Modified:
libmicrohttpd/configure.ac
libmicrohttpd/src/examples/Makefile.am
libmicrohttpd/src/microhttpd/Makefile.am
libmicrohttpd/src/spdy2http/Makefile.am
libmicrohttpd/src/testcurl/Makefile.am
libmicrohttpd/src/testcurl/https/Makefile.am
libmicrohttpd/src/testspdy/Makefile.am
libmicrohttpd/src/testzzuf/Makefile.am
Log:
Update usage of libcurl and libgnutls compiler flags, allow correct compilation
with "--with-gnutls=prefix"
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2014-03-06 09:42:04 UTC (rev 32563)
+++ libmicrohttpd/configure.ac 2014-03-06 10:50:52 UTC (rev 32564)
@@ -522,6 +522,10 @@
[AC_MSG_RESULT([$with_gnutls])
case $with_gnutls in
no)
+ GNUTLS_CPPFLAGS=""
+ GNUTLS_CFLAGS=""
+ GNUTLS_LDFLAGS=""
+ GNUTLS_LIBS=""
;;
yes)
GNUTLS_CPPFLAGS=""
@@ -556,6 +560,9 @@
have_gnutls=yes))])
AM_CONDITIONAL(HAVE_GNUTLS, test "x$have_gnutls" = "xyes")
+AC_SUBST([GNUTLS_CPPFLAGS])
+AC_SUBST([GNUTLS_LDFLAGS])
+AC_SUBST([GNUTLS_LIBS])
# optional: HTTPS support. Enabled by default
AC_MSG_CHECKING(whether to support HTTPS)
Modified: libmicrohttpd/src/examples/Makefile.am
===================================================================
--- libmicrohttpd/src/examples/Makefile.am 2014-03-06 09:42:04 UTC (rev
32563)
+++ libmicrohttpd/src/examples/Makefile.am 2014-03-06 10:50:52 UTC (rev
32564)
@@ -147,6 +147,8 @@
https_fileserver_example_SOURCES = \
https_fileserver_example.c
+https_fileserver_example_CPPFLAGS = \
+ $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS)
https_fileserver_example_LDADD = \
$(top_builddir)/src/microhttpd/libmicrohttpd.la
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2014-03-06 09:42:04 UTC (rev
32563)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2014-03-06 10:50:52 UTC (rev
32564)
@@ -129,7 +129,9 @@
if ENABLE_HTTPS
libmicrohttpd_la_SOURCES += \
connection_https.c connection_https.h
-libmicrohttpd_la_LIBADD += -lgnutls @LIBGCRYPT_LIBS@
+libmicrohttpd_la_CPPFLAGS += $(GNUTLS_CPPFLAGS)
+libmicrohttpd_la_LDFLAGS += $(GNUTLS_LDFLAGS)
+libmicrohttpd_la_LIBADD += $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@
endif
Modified: libmicrohttpd/src/spdy2http/Makefile.am
===================================================================
--- libmicrohttpd/src/spdy2http/Makefile.am 2014-03-06 09:42:04 UTC (rev
32563)
+++ libmicrohttpd/src/spdy2http/Makefile.am 2014-03-06 10:50:52 UTC (rev
32564)
@@ -11,7 +11,7 @@
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/applicationlayer \
-DDATA_DIR=\"$(top_srcdir)/src/datadir/\" \
-$(LIBCURL_CPPFLAGS)
+ $(LIBCURL_CPPFLAGS)
if !HAVE_W32
PERF_GET_CONCURRENT=perf_get_concurrent
@@ -25,4 +25,4 @@
microspdy2http_LDADD = \
$(top_builddir)/src/microspdy/libmicrospdy.la \
-lz \
- -lcurl
+ $(LIBCURL)
Modified: libmicrohttpd/src/testcurl/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/Makefile.am 2014-03-06 09:42:04 UTC (rev
32563)
+++ libmicrohttpd/src/testcurl/Makefile.am 2014-03-06 10:50:52 UTC (rev
32564)
@@ -123,13 +123,13 @@
test_digestauth.c
test_digestauth_LDADD = \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ @LIBGCRYPT_LIBS@
+ @LIBGCRYPT_LIBS@ @LIBCURL@
test_digestauth_with_arguments_SOURCES = \
test_digestauth_with_arguments.c
test_digestauth_with_arguments_LDADD = \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ @LIBGCRYPT_LIBS@
+ @LIBGCRYPT_LIBS@ @LIBCURL@
test_get_sendfile_SOURCES = \
test_get_sendfile.c
@@ -186,7 +186,7 @@
test_postform.c
test_postform_LDADD = \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ @LIBGCRYPT_LIBS@
+ @LIBGCRYPT_LIBS@ @LIBCURL@
test_post_loop_SOURCES = \
test_post_loop.c
@@ -232,7 +232,7 @@
test_postform.c
test_postform11_LDADD = \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ @LIBGCRYPT_LIBS@
+ @LIBGCRYPT_LIBS@ @LIBCURL@
test_post_loop11_SOURCES = \
test_post_loop.c
Modified: libmicrohttpd/src/testcurl/https/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/https/Makefile.am 2014-03-06 09:42:04 UTC
(rev 32563)
+++ libmicrohttpd/src/testcurl/https/Makefile.am 2014-03-06 10:50:52 UTC
(rev 32564)
@@ -8,7 +8,7 @@
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/microhttpd \
-I$(top_srcdir)/src/platform \
- $(LIBCURL_CPPFLAGS)
+ $(LIBCURL_CPPFLAGS) $(GNUTLS_CPPFLAGS)
check_PROGRAMS = \
test_tls_options \
@@ -46,7 +46,7 @@
test_https_time_out_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_tls_options_SOURCES = \
test_tls_options.c \
@@ -54,7 +54,7 @@
test_tls_options_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_get_parallel_SOURCES = \
test_https_get_parallel.c \
@@ -64,7 +64,7 @@
test_https_get_parallel_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(PTHREAD_LIBS) @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(PTHREAD_LIBS) $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_empty_response_SOURCES = \
test_empty_response.c \
@@ -72,7 +72,7 @@
test_empty_response_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_get_parallel_threads_SOURCES = \
test_https_get_parallel_threads.c \
@@ -82,7 +82,7 @@
test_https_get_parallel_threads_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- $(PTHREAD_LIBS) @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(PTHREAD_LIBS) $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_tls_authentication_SOURCES = \
test_tls_authentication.c \
@@ -90,7 +90,7 @@
test_tls_authentication_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_session_info_SOURCES = \
test_https_session_info.c \
@@ -98,7 +98,7 @@
test_https_session_info_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_multi_daemon_SOURCES = \
test_https_multi_daemon.c \
@@ -106,7 +106,7 @@
test_https_multi_daemon_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_get_SOURCES = \
test_https_get.c \
@@ -114,7 +114,7 @@
test_https_get_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_sni_SOURCES = \
test_https_sni.c \
@@ -125,7 +125,7 @@
test_https_sni_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
test_https_get_select_SOURCES = \
test_https_get_select.c \
@@ -133,5 +133,5 @@
test_https_get_select_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
Modified: libmicrohttpd/src/testspdy/Makefile.am
===================================================================
--- libmicrohttpd/src/testspdy/Makefile.am 2014-03-06 09:42:04 UTC (rev
32563)
+++ libmicrohttpd/src/testspdy/Makefile.am 2014-03-06 10:50:52 UTC (rev
32564)
@@ -10,7 +10,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/applicationlayer \
-$(LIBCURL_CPPFLAGS)
+ $(LIBCURL_CPPFLAGS)
if !HAVE_W32
PERF_GET_CONCURRENT=perf_get_concurrent
Modified: libmicrohttpd/src/testzzuf/Makefile.am
===================================================================
--- libmicrohttpd/src/testzzuf/Makefile.am 2014-03-06 09:42:04 UTC (rev
32563)
+++ libmicrohttpd/src/testzzuf/Makefile.am 2014-03-06 10:50:52 UTC (rev
32564)
@@ -5,7 +5,8 @@
endif
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include \
+ $(LIBCURL_CPPFLAGS)
EXTRA_DIST = README socat.c
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32564 - in libmicrohttpd: . src/examples src/microhttpd src/spdy2http src/testcurl src/testcurl/https src/testspdy src/testzzuf,
gnunet <=