[GNUnet-SVN] r28426 - in libmicrohttpd: . doc/examples src/examples src/include src/microhttpd src/testcurl src/testcurl/https src/testzzuf

[gnunet]

Author: grothoff
Date: 2013-08-07 08:22:16 +0200 (Wed, 07 Aug 2013)
New Revision: 28426

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/testcurl/Makefile.am
   libmicrohttpd/src/testcurl/https/Makefile.am
   libmicrohttpd/src/testzzuf/Makefile.am
Log:
Part 1 of 2 - Remove PlibC from autotools files. 

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2013-08-07 06:20:13 UTC (rev 28425)
+++ libmicrohttpd/configure.ac  2013-08-07 06:22:16 UTC (rev 28426)
@@ -170,12 +170,6 @@
      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])
@@ -225,10 +219,6 @@
 
 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)
 
@@ -560,7 +550,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      2013-08-07 06:20:13 UTC (rev 
28425)
+++ libmicrohttpd/doc/examples/Makefile.am      2013-08-07 06:22:16 UTC (rev 
28426)
@@ -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 \
   @LIBGCRYPT_CFLAGS@
 

Modified: libmicrohttpd/src/examples/Makefile.am
===================================================================
--- libmicrohttpd/src/examples/Makefile.am      2013-08-07 06:20:13 UTC (rev 
28425)
+++ libmicrohttpd/src/examples/Makefile.am      2013-08-07 06:22:16 UTC (rev 
28426)
@@ -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 \
   @LIBGCRYPT_CFLAGS@
 

Modified: libmicrohttpd/src/include/Makefile.am
===================================================================
--- libmicrohttpd/src/include/Makefile.am       2013-08-07 06:20:13 UTC (rev 
28425)
+++ libmicrohttpd/src/include/Makefile.am       2013-08-07 06:22:16 UTC (rev 
28426)
@@ -1,4 +1,4 @@
-SUBDIRS = plibc .
+SUBDIRS = .
 
 if ENABLE_SPDY
 microspdy = microspdy.h

Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am    2013-08-07 06:20:13 UTC (rev 
28425)
+++ libmicrohttpd/src/microhttpd/Makefile.am    2013-08-07 06:22:16 UTC (rev 
28426)
@@ -1,12 +1,7 @@
-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 06:20:13 UTC (rev 
28425)
+++ libmicrohttpd/src/testcurl/Makefile.am      2013-08-07 06:22:16 UTC (rev 
28426)
@@ -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/daemon \
 -I$(top_srcdir)/src/include \

Modified: libmicrohttpd/src/testcurl/https/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/https/Makefile.am        2013-08-07 06:20:13 UTC 
(rev 28425)
+++ libmicrohttpd/src/testcurl/https/Makefile.am        2013-08-07 06:22:16 UTC 
(rev 28426)
@@ -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 \
   $(LIBCURL_CPPFLAGS)

Modified: libmicrohttpd/src/testzzuf/Makefile.am
===================================================================
--- libmicrohttpd/src/testzzuf/Makefile.am      2013-08-07 06:20:13 UTC (rev 
28425)
+++ libmicrohttpd/src/testzzuf/Makefile.am      2013-08-07 06:22:16 UTC (rev 
28426)
@@ -4,12 +4,8 @@
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
+INCLUDES = -I$(top_srcdir)/src/include
 
-INCLUDES = $(PLIBC_INCLUDE) -I$(top_srcdir)/src/include
-
 EXTRA_DIST = README socat.c
 
 check_PROGRAMS = \