From 241fc046a7135d8f863bcc7d33e4d877ca43e6ea Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Wed, 13 Dec 2017 09:23:04 +0100
Subject: [PATCH] zlib: Do not generate zconf.h

Update #3254.
---
 cpukit/{zlib/zconf.h.in => include/zconf.h} | 4 ++--
 cpukit/zlib/Makefile.am                     | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)
 rename cpukit/{zlib/zconf.h.in => include/zconf.h} (99%)

diff --git a/cpukit/zlib/zconf.h.in b/cpukit/include/zconf.h
similarity index 99%
rename from cpukit/zlib/zconf.h.in
rename to cpukit/include/zconf.h
index 5e115b6fba..a1d94ea8ee 100644
--- a/cpukit/zlib/zconf.h.in
+++ b/cpukit/include/zconf.h
@@ -12,7 +12,7 @@
  * Even better than compiling with -DZ_PREFIX would be to use configure to set
  * this permanently in zconf.h using "./configure --zprefix".
  */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#if 1 /* is set to #if 1 for RTEMS */
 
 /* all linked symbols */
 #  define _dist_code            z__dist_code
@@ -354,7 +354,7 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#if 1 /* is set to #if 1 for RTEMS */
 #  define Z_HAVE_UNISTD_H
 #endif
 
diff --git a/cpukit/zlib/Makefile.am b/cpukit/zlib/Makefile.am
index 478134b560..586cf16c4c 100644
--- a/cpukit/zlib/Makefile.am
+++ b/cpukit/zlib/Makefile.am
@@ -20,13 +20,5 @@ libz_a_SOURCES += zutil.c zutil.h
 
 include_HEADERS = zlib.h zconf.h
 
-zconf.h: $(srcdir)/zconf.h.in
-	sed \
-	  -e 's,#ifdef Z_PREFIX.* may be ,#if 1 /* was ,' \
-	  -e 's,#ifdef HAVE_UNISTD_H.* may be ,#if 1 /* was ,' \
-	< $(srcdir)/zconf.h.in > zconf.h
-CLEANFILES = zconf.h
-EXTRA_DIST = zconf.h.in
-
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am