aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-08-07 22:05:53 +0000
committerChristian Grothoff <christian@grothoff.org>2013-08-07 22:05:53 +0000
commit22941cd1b63afa6db6f6b71028f2a30be8fb1b5c (patch)
tree5c515a77ff2cf2c6793c69e5ff8f653cedf33baf
parent35d4603ed1f6ce1b03071d2cc9e037a6830a7a43 (diff)
downloadlibmicrohttpd-22941cd1b63afa6db6f6b71028f2a30be8fb1b5c.tar.gz
libmicrohttpd-22941cd1b63afa6db6f6b71028f2a30be8fb1b5c.zip
-fix reactivating plibc
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac11
-rw-r--r--doc/examples/Makefile.am5
-rw-r--r--src/examples/Makefile.am5
-rw-r--r--src/include/Makefile.am2
-rw-r--r--src/microhttpd/Makefile.am7
-rw-r--r--src/testcurl/Makefile.am5
-rw-r--r--src/testcurl/https/Makefile.am5
-rw-r--r--src/testzzuf/Makefile.am6
9 files changed, 44 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bbae4c39..472f292c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,5 @@
1Wed Aug 7 08:17:40 CEST 2013 1Wed Aug 7 08:17:40 CEST 2013
2 Removing dependency on liberty, use rand instead of 2 Removing dependency on PlibC. -MC
3 random in test. -MC
4 3
5Fri Aug 2 20:55:47 CEST 2013 4Fri Aug 2 20:55:47 CEST 2013
6 Fix HTTP 1.1 compliance with respect to not returning 5 Fix HTTP 1.1 compliance with respect to not returning
diff --git a/configure.ac b/configure.ac
index 43f5234d..1f472830 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,12 @@ netbsd*)
170 AM_CONDITIONAL(HAVE_W32, true) 170 AM_CONDITIONAL(HAVE_W32, true)
171 LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols -lws2_32" 171 LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols -lws2_32"
172 AM_CONDITIONAL(HAVE_GNU_LD, true) 172 AM_CONDITIONAL(HAVE_GNU_LD, true)
173 # check if PlibC is available
174 CHECK_PLIBC
175 LIBS="$PLIBC_LIBS $LIBS"
176 AC_SUBST(PLIBC_LIBS)
177 AC_SUBST(PLIBC_LDFLAGS)
178 AC_SUBST(PLIBC_CPPFLAGS)
173 ;; 179 ;;
174*openedition*) 180*openedition*)
175 AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system]) 181 AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system])
@@ -219,6 +225,10 @@ AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h netinet/
219 225
220AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true), AM_CONDITIONAL(HAVE_TSEARCH, false)) 226AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true), AM_CONDITIONAL(HAVE_TSEARCH, false))
221 227
228# Check for plibc.h from system, if not found, use our own
229AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1)
230AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1)
231
222AC_CHECK_FUNCS_ONCE(memmem) 232AC_CHECK_FUNCS_ONCE(memmem)
223AC_CHECK_FUNCS_ONCE(accept4) 233AC_CHECK_FUNCS_ONCE(accept4)
224 234
@@ -550,6 +560,7 @@ doc/examples/Makefile
550m4/Makefile 560m4/Makefile
551src/Makefile 561src/Makefile
552src/include/Makefile 562src/include/Makefile
563src/include/plibc/Makefile
553src/microhttpd/Makefile 564src/microhttpd/Makefile
554src/microspdy/Makefile 565src/microspdy/Makefile
555src/spdy2http/Makefile 566src/spdy2http/Makefile
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index c1bbb451..4cfc7be7 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,6 +1,11 @@
1SUBDIRS = . 1SUBDIRS = .
2 2
3if USE_PRIVATE_PLIBC_H
4 PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
5endif
6
3AM_CPPFLAGS = \ 7AM_CPPFLAGS = \
8 $(PLIBC_INCLUDE) \
4 -I$(top_srcdir)/src/include \ 9 -I$(top_srcdir)/src/include \
5 @LIBGCRYPT_CFLAGS@ 10 @LIBGCRYPT_CFLAGS@
6 11
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 5dbd52ef..6a2f31b5 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,6 +1,11 @@
1SUBDIRS = . 1SUBDIRS = .
2 2
3if USE_PRIVATE_PLIBC_H
4 PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
5endif
6
3AM_CPPFLAGS = \ 7AM_CPPFLAGS = \
8 $(PLIBC_INCLUDE) \
4 -I$(top_srcdir)/src/include \ 9 -I$(top_srcdir)/src/include \
5 @LIBGCRYPT_CFLAGS@ 10 @LIBGCRYPT_CFLAGS@
6 11
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 66761396..cce55616 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,4 +1,4 @@
1SUBDIRS = . 1SUBDIRS = plibc .
2 2
3if ENABLE_SPDY 3if ENABLE_SPDY
4microspdy = microspdy.h 4microspdy = microspdy.h
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index b4d8663f..4ff623ae 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -1,7 +1,12 @@
1if USE_PRIVATE_PLIBC_H
2 PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
3endif
4
1AM_CPPFLAGS = \ 5AM_CPPFLAGS = \
6 $(PLIBC_INCLUDE) \
2 -I$(top_srcdir)/src/include \ 7 -I$(top_srcdir)/src/include \
3 -I$(top_srcdir)/src/daemon \ 8 -I$(top_srcdir)/src/daemon \
4 @LIBGCRYPT_CFLAGS@ 9 @LIBGCRYPT_CFLAGS@
5 10
6EXTRA_DIST = EXPORT.sym 11EXTRA_DIST = EXPORT.sym
7 12
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index fd4696e7..b83983e8 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -8,7 +8,12 @@ if ENABLE_HTTPS
8 SUBDIRS += https 8 SUBDIRS += https
9endif 9endif
10 10
11if USE_PRIVATE_PLIBC_H
12 PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
13endif
14
11AM_CPPFLAGS = \ 15AM_CPPFLAGS = \
16 $(PLIBC_INCLUDE) \
12-I$(top_srcdir) \ 17-I$(top_srcdir) \
13-I$(top_srcdir)/src/daemon \ 18-I$(top_srcdir)/src/daemon \
14-I$(top_srcdir)/src/include \ 19-I$(top_srcdir)/src/include \
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 0bcc5569..1a1cc232 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -4,7 +4,12 @@ if USE_COVERAGE
4 AM_CFLAGS = --coverage 4 AM_CFLAGS = --coverage
5endif 5endif
6 6
7if USE_PRIVATE_PLIBC_H
8 PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
9endif
10
7AM_CPPFLAGS = \ 11AM_CPPFLAGS = \
12 $(PLIBC_INCLUDE) \
8 -I$(top_srcdir)/src/include \ 13 -I$(top_srcdir)/src/include \
9 -I$(top_srcdir)/src/microhttpd \ 14 -I$(top_srcdir)/src/microhttpd \
10 $(LIBCURL_CPPFLAGS) 15 $(LIBCURL_CPPFLAGS)
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index 6c908339..2b72f404 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -4,7 +4,11 @@ if USE_COVERAGE
4 AM_CFLAGS = -fprofile-arcs -ftest-coverage 4 AM_CFLAGS = -fprofile-arcs -ftest-coverage
5endif 5endif
6 6
7INCLUDES = -I$(top_srcdir)/src/include 7if USE_PRIVATE_PLIBC_H
8 PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
9endif
10
11INCLUDES = $(PLIBC_INCLUDE) -I$(top_srcdir)/src/include
8 12
9EXTRA_DIST = README socat.c 13EXTRA_DIST = README socat.c
10 14