[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28445 - in libmicrohttpd: . doc/examples src/examples src/
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28445 - in libmicrohttpd: . doc/examples src/examples src/include src/microhttpd src/testcurl src/testcurl/https src/testzzuf |
Date: |
Thu, 8 Aug 2013 00:05:54 +0200 |
Author: grothoff
Date: 2013-08-08 00:05:53 +0200 (Thu, 08 Aug 2013)
New Revision: 28445
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/configure.ac
libmicrohttpd/doc/examples/Makefile.am
libmicrohttpd/src/examples/Makefile.am
libmicrohttpd/src/include/Makefile.am
libmicrohttpd/src/microhttpd/Makefile.am
libmicrohttpd/src/testcurl/Makefile.am
libmicrohttpd/src/testcurl/https/Makefile.am
libmicrohttpd/src/testzzuf/Makefile.am
Log:
-fix reactivating plibc
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2013-08-07 21:28:16 UTC (rev 28444)
+++ libmicrohttpd/ChangeLog 2013-08-07 22:05:53 UTC (rev 28445)
@@ -1,6 +1,5 @@
Wed Aug 7 08:17:40 CEST 2013
- Removing dependency on liberty, use rand instead of
- random in test. -MC
+ Removing dependency on PlibC. -MC
Fri Aug 2 20:55:47 CEST 2013
Fix HTTP 1.1 compliance with respect to not returning
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2013-08-07 21:28:16 UTC (rev 28444)
+++ libmicrohttpd/configure.ac 2013-08-07 22:05:53 UTC (rev 28445)
@@ -170,6 +170,12 @@
AM_CONDITIONAL(HAVE_W32, true)
LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols -lws2_32"
AM_CONDITIONAL(HAVE_GNU_LD, true)
+ # check if PlibC is available
+ CHECK_PLIBC
+ LIBS="$PLIBC_LIBS $LIBS"
+ AC_SUBST(PLIBC_LIBS)
+ AC_SUBST(PLIBC_LDFLAGS)
+ AC_SUBST(PLIBC_CPPFLAGS)
;;
*openedition*)
AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system])
@@ -219,6 +225,10 @@
AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true),
AM_CONDITIONAL(HAVE_TSEARCH, false))
+# Check for plibc.h from system, if not found, use our own
+AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1)
+AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1)
+
AC_CHECK_FUNCS_ONCE(memmem)
AC_CHECK_FUNCS_ONCE(accept4)
@@ -550,6 +560,7 @@
m4/Makefile
src/Makefile
src/include/Makefile
+src/include/plibc/Makefile
src/microhttpd/Makefile
src/microspdy/Makefile
src/spdy2http/Makefile
Modified: libmicrohttpd/doc/examples/Makefile.am
===================================================================
--- libmicrohttpd/doc/examples/Makefile.am 2013-08-07 21:28:16 UTC (rev
28444)
+++ libmicrohttpd/doc/examples/Makefile.am 2013-08-07 22:05:53 UTC (rev
28445)
@@ -1,6 +1,11 @@
SUBDIRS = .
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
AM_CPPFLAGS = \
+ $(PLIBC_INCLUDE) \
-I$(top_srcdir)/src/include \
@LIBGCRYPT_CFLAGS@
Modified: libmicrohttpd/src/examples/Makefile.am
===================================================================
--- libmicrohttpd/src/examples/Makefile.am 2013-08-07 21:28:16 UTC (rev
28444)
+++ libmicrohttpd/src/examples/Makefile.am 2013-08-07 22:05:53 UTC (rev
28445)
@@ -1,6 +1,11 @@
SUBDIRS = .
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
AM_CPPFLAGS = \
+ $(PLIBC_INCLUDE) \
-I$(top_srcdir)/src/include \
@LIBGCRYPT_CFLAGS@
Modified: libmicrohttpd/src/include/Makefile.am
===================================================================
--- libmicrohttpd/src/include/Makefile.am 2013-08-07 21:28:16 UTC (rev
28444)
+++ libmicrohttpd/src/include/Makefile.am 2013-08-07 22:05:53 UTC (rev
28445)
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS = plibc .
if ENABLE_SPDY
microspdy = microspdy.h
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2013-08-07 21:28:16 UTC (rev
28444)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2013-08-07 22:05:53 UTC (rev
28445)
@@ -1,7 +1,12 @@
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
AM_CPPFLAGS = \
+ $(PLIBC_INCLUDE) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/daemon \
- @LIBGCRYPT_CFLAGS@
+ @LIBGCRYPT_CFLAGS@
EXTRA_DIST = EXPORT.sym
Modified: libmicrohttpd/src/testcurl/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/Makefile.am 2013-08-07 21:28:16 UTC (rev
28444)
+++ libmicrohttpd/src/testcurl/Makefile.am 2013-08-07 22:05:53 UTC (rev
28445)
@@ -8,7 +8,12 @@
SUBDIRS += https
endif
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
AM_CPPFLAGS = \
+ $(PLIBC_INCLUDE) \
-I$(top_srcdir) \
-I$(top_srcdir)/src/daemon \
-I$(top_srcdir)/src/include \
Modified: libmicrohttpd/src/testcurl/https/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/https/Makefile.am 2013-08-07 21:28:16 UTC
(rev 28444)
+++ libmicrohttpd/src/testcurl/https/Makefile.am 2013-08-07 22:05:53 UTC
(rev 28445)
@@ -4,7 +4,12 @@
AM_CFLAGS = --coverage
endif
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
AM_CPPFLAGS = \
+ $(PLIBC_INCLUDE) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/microhttpd \
$(LIBCURL_CPPFLAGS)
Modified: libmicrohttpd/src/testzzuf/Makefile.am
===================================================================
--- libmicrohttpd/src/testzzuf/Makefile.am 2013-08-07 21:28:16 UTC (rev
28444)
+++ libmicrohttpd/src/testzzuf/Makefile.am 2013-08-07 22:05:53 UTC (rev
28445)
@@ -4,8 +4,12 @@
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
-INCLUDES = -I$(top_srcdir)/src/include
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+INCLUDES = $(PLIBC_INCLUDE) -I$(top_srcdir)/src/include
+
EXTRA_DIST = README socat.c
check_PROGRAMS = \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28445 - in libmicrohttpd: . doc/examples src/examples src/include src/microhttpd src/testcurl src/testcurl/https src/testzzuf,
gnunet <=