move plibc to prefer system-wide plibc.h over our version

10 files changed, 36 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index 362efbad..a98f7633 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,10 @@ AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h sy
 # Check for optional headers
 AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h sys/select.h poll.h])
 
+# 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(memmem)
 
 # IPv6
@@ -342,6 +346,7 @@ doc/Makefile
 m4/Makefile
 src/Makefile
 src/include/Makefile
+src/include/plibc/Makefile
 src/daemon/Makefile
 src/examples/Makefile
 src/testcurl/Makefile
@@ -387,5 +392,3 @@ else
   License         :  LGPL or eCos
 ])
 fi  
-
-
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 65e34abd..ac356cd7 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,4 +1,9 @@
+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@ 
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index ae577cec..439ec442 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -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@
 
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index f76fe3b0..417d1f83 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS = plibc .
 include_HEADERS = microhttpd.h
 
-EXTRA_DIST = platform.h plibc.h
+EXTRA_DIST = platform.h 
diff --git a/src/include/platform.h b/src/include/platform.h
index 431ae480..93faf2fb 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -109,7 +109,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "plibc.h"
+#include <plibc.h>
 
 
 #endif
diff --git a/src/include/plibc/Makefile.am b/src/include/plibc/Makefile.am
new file mode 100644
index 00000000..ecfd4c6a
--- /dev/null
+++ b/src/include/plibc/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = .
+
+EXTRA_DIST = plibc.h 
diff --git a/src/include/plibc.h b/src/include/plibc/plibc.h
index a1d3b131..a1d3b131 100644
--- a/src/include/plibc.h
+++ b/src/include/plibc/plibc.h
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index c7124a19..2435ec83 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -8,7 +8,12 @@ if ENABLE_HTTPS
   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 \
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index d43cfe13..4c6b742f 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -4,7 +4,12 @@ if USE_COVERAGE
   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/daemon \
   $(LIBCURL_CPPFLAGS)
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index 42bc2fdc..a50c9e3a 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -4,7 +4,11 @@ if USE_COVERAGE
   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