[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32405 - in libmicrohttpd: . doc/examples src/examples src/
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32405 - in libmicrohttpd: . doc/examples src/examples src/include src/microhttpd src/microspdy src/spdy2http src/testcurl src/testcurl/https src/testspdy src/testzzuf |
Date: |
Tue, 18 Feb 2014 19:40:51 +0100 |
Author: Karlson2k
Date: 2014-02-18 19:40:50 +0100 (Tue, 18 Feb 2014)
New Revision: 32405
Modified:
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/microspdy/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:
Remove PlibC from autotools files
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2014-02-18 18:40:24 UTC (rev 32404)
+++ libmicrohttpd/configure.ac 2014-02-18 18:40:50 UTC (rev 32405)
@@ -83,9 +83,6 @@
#include <netinet/in.h>
])
-# Needed for plibc.h
-AC_CHECK_DECLS([_stati64, _wstat32i64])
-
AC_CHECK_PROG(HAVE_CURL_BINARY,[curl],true,false)
AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY)
AC_CHECK_PROG(HAVE_MAKEINFO_BINARY,[makeinfo],true,false)
@@ -175,12 +172,6 @@
AM_CONDITIONAL(HAVE_W32, true)
LDFLAGS="$LDFLAGS -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)
os_is_windows=yes
;;
*openedition*)
@@ -262,10 +253,6 @@
AC_DEFINE([[MHD_DONT_USE_PIPES]], [[1]], [Define to use pair of sockets
instead of pipes for signaling])
fi
-# 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)
AC_MSG_CHECKING([[for gmtime_s]])
@@ -635,7 +622,6 @@
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 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/doc/examples/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -1,11 +1,6 @@
SUBDIRS = .
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
AM_CPPFLAGS = \
- $(PLIBC_INCLUDE) \
-I$(top_srcdir)/src/include
AM_CFLAGS = @LIBGCRYPT_CFLAGS@
Modified: libmicrohttpd/src/examples/Makefile.am
===================================================================
--- libmicrohttpd/src/examples/Makefile.am 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/src/examples/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -1,11 +1,6 @@
SUBDIRS = .
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
AM_CPPFLAGS = \
- $(PLIBC_INCLUDE) \
-I$(top_srcdir)/src/include \
-DDATA_DIR=\"$(top_srcdir)/src/datadir/\"
Modified: libmicrohttpd/src/include/Makefile.am
===================================================================
--- libmicrohttpd/src/include/Makefile.am 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/src/include/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -1,4 +1,4 @@
-SUBDIRS = plibc .
+SUBDIRS = .
if ENABLE_SPDY
microspdy = microspdy.h
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -1,13 +1,8 @@
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
if HAVE_W32
W32FUNC_SRC = ../platform/w32functions.c ../platform/w32functions.h
endif
AM_CPPFLAGS = \
- $(PLIBC_INCLUDE) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/microhttpd \
-I$(top_srcdir)/src/platform
Modified: libmicrohttpd/src/microspdy/Makefile.am
===================================================================
--- libmicrohttpd/src/microspdy/Makefile.am 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/src/microspdy/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -1,9 +1,4 @@
-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/microspdy
Modified: libmicrohttpd/src/spdy2http/Makefile.am
===================================================================
--- libmicrohttpd/src/spdy2http/Makefile.am 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/src/spdy2http/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -6,12 +6,7 @@
AM_CFLAGS += -fprofile-arcs -ftest-coverage
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/include \
-I$(top_srcdir)/src/applicationlayer \
Modified: libmicrohttpd/src/testcurl/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/Makefile.am 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/src/testcurl/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -8,12 +8,7 @@
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/microhttpd \
-I$(top_srcdir)/src/include \
Modified: libmicrohttpd/src/testcurl/https/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/https/Makefile.am 2014-02-18 18:40:24 UTC
(rev 32404)
+++ libmicrohttpd/src/testcurl/https/Makefile.am 2014-02-18 18:40:50 UTC
(rev 32405)
@@ -4,12 +4,7 @@
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 \
-I$(top_srcdir)/src/platform \
Modified: libmicrohttpd/src/testspdy/Makefile.am
===================================================================
--- libmicrohttpd/src/testspdy/Makefile.am 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/src/testspdy/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -6,12 +6,7 @@
AM_CFLAGS += -fprofile-arcs -ftest-coverage
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/include \
-I$(top_srcdir)/src/applicationlayer \
Modified: libmicrohttpd/src/testzzuf/Makefile.am
===================================================================
--- libmicrohttpd/src/testzzuf/Makefile.am 2014-02-18 18:40:24 UTC (rev
32404)
+++ libmicrohttpd/src/testzzuf/Makefile.am 2014-02-18 18:40:50 UTC (rev
32405)
@@ -4,11 +4,8 @@
AM_CFLAGS = -fprofile-arcs -ftest-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
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
EXTRA_DIST = README socat.c
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32405 - in libmicrohttpd: . doc/examples src/examples src/include src/microhttpd src/microspdy src/spdy2http src/testcurl src/testcurl/https src/testspdy src/testzzuf,
gnunet <=