diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-02-18 18:40:50 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-02-18 18:40:50 +0000 |
commit | 41e5c4888a6e5a87dfcd75f4b76e6e6f2e6cb280 (patch) | |
tree | 1cf252b4647b7699d3ac1828906af33480a04b52 | |
parent | f0316a499cde1bb0e3b655ea2a451032c34df005 (diff) | |
download | libmicrohttpd-41e5c4888a6e5a87dfcd75f4b76e6e6f2e6cb280.tar.gz libmicrohttpd-41e5c4888a6e5a87dfcd75f4b76e6e6f2e6cb280.zip |
Remove PlibC from autotools files
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | doc/examples/Makefile.am | 5 | ||||
-rw-r--r-- | src/examples/Makefile.am | 5 | ||||
-rw-r--r-- | src/include/Makefile.am | 2 | ||||
-rw-r--r-- | src/microhttpd/Makefile.am | 5 | ||||
-rw-r--r-- | src/microspdy/Makefile.am | 5 | ||||
-rw-r--r-- | src/spdy2http/Makefile.am | 5 | ||||
-rw-r--r-- | src/testcurl/Makefile.am | 5 | ||||
-rw-r--r-- | src/testcurl/https/Makefile.am | 5 | ||||
-rw-r--r-- | src/testspdy/Makefile.am | 5 | ||||
-rw-r--r-- | src/testzzuf/Makefile.am | 5 |
11 files changed, 2 insertions, 59 deletions
diff --git a/configure.ac b/configure.ac index 5562a61d..301ad0cd 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -83,9 +83,6 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], | |||
83 | #include <netinet/in.h> | 83 | #include <netinet/in.h> |
84 | ]) | 84 | ]) |
85 | 85 | ||
86 | # Needed for plibc.h | ||
87 | AC_CHECK_DECLS([_stati64, _wstat32i64]) | ||
88 | |||
89 | AC_CHECK_PROG(HAVE_CURL_BINARY,[curl],true,false) | 86 | AC_CHECK_PROG(HAVE_CURL_BINARY,[curl],true,false) |
90 | AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY) | 87 | AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY) |
91 | AC_CHECK_PROG(HAVE_MAKEINFO_BINARY,[makeinfo],true,false) | 88 | AC_CHECK_PROG(HAVE_MAKEINFO_BINARY,[makeinfo],true,false) |
@@ -175,12 +172,6 @@ netbsd*) | |||
175 | AM_CONDITIONAL(HAVE_W32, true) | 172 | AM_CONDITIONAL(HAVE_W32, true) |
176 | LDFLAGS="$LDFLAGS -lws2_32" | 173 | LDFLAGS="$LDFLAGS -lws2_32" |
177 | AM_CONDITIONAL(HAVE_GNU_LD, true) | 174 | AM_CONDITIONAL(HAVE_GNU_LD, true) |
178 | # check if PlibC is available | ||
179 | CHECK_PLIBC | ||
180 | LIBS="$PLIBC_LIBS $LIBS" | ||
181 | AC_SUBST(PLIBC_LIBS) | ||
182 | AC_SUBST(PLIBC_LDFLAGS) | ||
183 | AC_SUBST(PLIBC_CPPFLAGS) | ||
184 | os_is_windows=yes | 175 | os_is_windows=yes |
185 | ;; | 176 | ;; |
186 | *openedition*) | 177 | *openedition*) |
@@ -262,10 +253,6 @@ if test "x$disable_pipes" = "xyes"; then | |||
262 | AC_DEFINE([[MHD_DONT_USE_PIPES]], [[1]], [Define to use pair of sockets instead of pipes for signaling]) | 253 | AC_DEFINE([[MHD_DONT_USE_PIPES]], [[1]], [Define to use pair of sockets instead of pipes for signaling]) |
263 | fi | 254 | fi |
264 | 255 | ||
265 | # Check for plibc.h from system, if not found, use our own | ||
266 | AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1) | ||
267 | AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1) | ||
268 | |||
269 | AC_CHECK_FUNCS_ONCE(memmem) | 256 | AC_CHECK_FUNCS_ONCE(memmem) |
270 | AC_CHECK_FUNCS_ONCE(accept4) | 257 | AC_CHECK_FUNCS_ONCE(accept4) |
271 | AC_MSG_CHECKING([[for gmtime_s]]) | 258 | AC_MSG_CHECKING([[for gmtime_s]]) |
@@ -635,7 +622,6 @@ doc/examples/Makefile | |||
635 | m4/Makefile | 622 | m4/Makefile |
636 | src/Makefile | 623 | src/Makefile |
637 | src/include/Makefile | 624 | src/include/Makefile |
638 | src/include/plibc/Makefile | ||
639 | src/microhttpd/Makefile | 625 | src/microhttpd/Makefile |
640 | src/microspdy/Makefile | 626 | src/microspdy/Makefile |
641 | src/spdy2http/Makefile | 627 | src/spdy2http/Makefile |
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index e4335985..8a385ba8 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am | |||
@@ -1,11 +1,6 @@ | |||
1 | SUBDIRS = . | 1 | SUBDIRS = . |
2 | 2 | ||
3 | if USE_PRIVATE_PLIBC_H | ||
4 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
5 | endif | ||
6 | |||
7 | AM_CPPFLAGS = \ | 3 | AM_CPPFLAGS = \ |
8 | $(PLIBC_INCLUDE) \ | ||
9 | -I$(top_srcdir)/src/include | 4 | -I$(top_srcdir)/src/include |
10 | 5 | ||
11 | AM_CFLAGS = @LIBGCRYPT_CFLAGS@ | 6 | AM_CFLAGS = @LIBGCRYPT_CFLAGS@ |
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index f5fd2be0..f8147bbf 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am | |||
@@ -1,11 +1,6 @@ | |||
1 | SUBDIRS = . | 1 | SUBDIRS = . |
2 | 2 | ||
3 | if USE_PRIVATE_PLIBC_H | ||
4 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
5 | endif | ||
6 | |||
7 | AM_CPPFLAGS = \ | 3 | AM_CPPFLAGS = \ |
8 | $(PLIBC_INCLUDE) \ | ||
9 | -I$(top_srcdir)/src/include \ | 4 | -I$(top_srcdir)/src/include \ |
10 | -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" | 5 | -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" |
11 | 6 | ||
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index cce55616..66761396 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am | |||
@@ -1,4 +1,4 @@ | |||
1 | SUBDIRS = plibc . | 1 | SUBDIRS = . |
2 | 2 | ||
3 | if ENABLE_SPDY | 3 | if ENABLE_SPDY |
4 | microspdy = microspdy.h | 4 | microspdy = microspdy.h |
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am index 7dd6ba77..b88e6fa9 100644 --- a/src/microhttpd/Makefile.am +++ b/src/microhttpd/Makefile.am | |||
@@ -1,13 +1,8 @@ | |||
1 | if USE_PRIVATE_PLIBC_H | ||
2 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
3 | endif | ||
4 | |||
5 | if HAVE_W32 | 1 | if HAVE_W32 |
6 | W32FUNC_SRC = ../platform/w32functions.c ../platform/w32functions.h | 2 | W32FUNC_SRC = ../platform/w32functions.c ../platform/w32functions.h |
7 | endif | 3 | endif |
8 | 4 | ||
9 | AM_CPPFLAGS = \ | 5 | AM_CPPFLAGS = \ |
10 | $(PLIBC_INCLUDE) \ | ||
11 | -I$(top_srcdir)/src/include \ | 6 | -I$(top_srcdir)/src/include \ |
12 | -I$(top_srcdir)/src/microhttpd \ | 7 | -I$(top_srcdir)/src/microhttpd \ |
13 | -I$(top_srcdir)/src/platform | 8 | -I$(top_srcdir)/src/platform |
diff --git a/src/microspdy/Makefile.am b/src/microspdy/Makefile.am index 1af67a0d..bc480646 100644 --- a/src/microspdy/Makefile.am +++ b/src/microspdy/Makefile.am | |||
@@ -1,9 +1,4 @@ | |||
1 | if USE_PRIVATE_PLIBC_H | ||
2 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
3 | endif | ||
4 | |||
5 | AM_CPPFLAGS = \ | 1 | AM_CPPFLAGS = \ |
6 | $(PLIBC_INCLUDE) \ | ||
7 | -I$(top_srcdir)/src/include \ | 2 | -I$(top_srcdir)/src/include \ |
8 | -I$(top_srcdir)/src/microspdy | 3 | -I$(top_srcdir)/src/microspdy |
9 | 4 | ||
diff --git a/src/spdy2http/Makefile.am b/src/spdy2http/Makefile.am index 8b83ee91..4498fba9 100644 --- a/src/spdy2http/Makefile.am +++ b/src/spdy2http/Makefile.am | |||
@@ -6,12 +6,7 @@ if USE_COVERAGE | |||
6 | AM_CFLAGS += -fprofile-arcs -ftest-coverage | 6 | AM_CFLAGS += -fprofile-arcs -ftest-coverage |
7 | endif | 7 | endif |
8 | 8 | ||
9 | if USE_PRIVATE_PLIBC_H | ||
10 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
11 | endif | ||
12 | |||
13 | AM_CPPFLAGS = \ | 9 | AM_CPPFLAGS = \ |
14 | $(PLIBC_INCLUDE) \ | ||
15 | -I$(top_srcdir) \ | 10 | -I$(top_srcdir) \ |
16 | -I$(top_srcdir)/src/include \ | 11 | -I$(top_srcdir)/src/include \ |
17 | -I$(top_srcdir)/src/applicationlayer \ | 12 | -I$(top_srcdir)/src/applicationlayer \ |
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am index 33e95d36..627d09a2 100644 --- a/src/testcurl/Makefile.am +++ b/src/testcurl/Makefile.am | |||
@@ -8,12 +8,7 @@ if ENABLE_HTTPS | |||
8 | SUBDIRS += https | 8 | SUBDIRS += https |
9 | endif | 9 | endif |
10 | 10 | ||
11 | if USE_PRIVATE_PLIBC_H | ||
12 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
13 | endif | ||
14 | |||
15 | AM_CPPFLAGS = \ | 11 | AM_CPPFLAGS = \ |
16 | $(PLIBC_INCLUDE) \ | ||
17 | -I$(top_srcdir) \ | 12 | -I$(top_srcdir) \ |
18 | -I$(top_srcdir)/src/microhttpd \ | 13 | -I$(top_srcdir)/src/microhttpd \ |
19 | -I$(top_srcdir)/src/include \ | 14 | -I$(top_srcdir)/src/include \ |
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am index 2051423d..37313343 100644 --- a/src/testcurl/https/Makefile.am +++ b/src/testcurl/https/Makefile.am | |||
@@ -4,12 +4,7 @@ if USE_COVERAGE | |||
4 | AM_CFLAGS = --coverage | 4 | AM_CFLAGS = --coverage |
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_PRIVATE_PLIBC_H | ||
8 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
9 | endif | ||
10 | |||
11 | AM_CPPFLAGS = \ | 7 | AM_CPPFLAGS = \ |
12 | $(PLIBC_INCLUDE) \ | ||
13 | -I$(top_srcdir)/src/include \ | 8 | -I$(top_srcdir)/src/include \ |
14 | -I$(top_srcdir)/src/microhttpd \ | 9 | -I$(top_srcdir)/src/microhttpd \ |
15 | -I$(top_srcdir)/src/platform \ | 10 | -I$(top_srcdir)/src/platform \ |
diff --git a/src/testspdy/Makefile.am b/src/testspdy/Makefile.am index b7e16fba..769e8bba 100644 --- a/src/testspdy/Makefile.am +++ b/src/testspdy/Makefile.am | |||
@@ -6,12 +6,7 @@ if USE_COVERAGE | |||
6 | AM_CFLAGS += -fprofile-arcs -ftest-coverage | 6 | AM_CFLAGS += -fprofile-arcs -ftest-coverage |
7 | endif | 7 | endif |
8 | 8 | ||
9 | if USE_PRIVATE_PLIBC_H | ||
10 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
11 | endif | ||
12 | |||
13 | AM_CPPFLAGS = \ | 9 | AM_CPPFLAGS = \ |
14 | $(PLIBC_INCLUDE) \ | ||
15 | -I$(top_srcdir) \ | 10 | -I$(top_srcdir) \ |
16 | -I$(top_srcdir)/src/include \ | 11 | -I$(top_srcdir)/src/include \ |
17 | -I$(top_srcdir)/src/applicationlayer \ | 12 | -I$(top_srcdir)/src/applicationlayer \ |
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am index c2fc9dee..99a1485e 100644 --- a/src/testzzuf/Makefile.am +++ b/src/testzzuf/Makefile.am | |||
@@ -4,11 +4,8 @@ if USE_COVERAGE | |||
4 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 4 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_PRIVATE_PLIBC_H | ||
8 | PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc | ||
9 | endif | ||
10 | 7 | ||
11 | AM_CPPFLAGS = $(PLIBC_INCLUDE) -I$(top_srcdir)/src/include | 8 | AM_CPPFLAGS = -I$(top_srcdir)/src/include |
12 | 9 | ||
13 | EXTRA_DIST = README socat.c | 10 | EXTRA_DIST = README socat.c |
14 | 11 | ||