diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-13 09:23:04 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-13 09:25:55 +0100 |
| commit | 241fc046a7135d8f863bcc7d33e4d877ca43e6ea (patch) | |
| tree | 310a1bbe6e057e92e42bfe4519287e1981b13722 | |
| parent | telnetd: Include <rtems/passwd.h> (diff) | |
| download | rtems-241fc046a7135d8f863bcc7d33e4d877ca43e6ea.tar.bz2 | |
zlib: Do not generate zconf.h
Update #3254.
| -rw-r--r-- | cpukit/include/zconf.h (renamed from cpukit/zlib/zconf.h.in) | 4 | ||||
| -rw-r--r-- | cpukit/zlib/Makefile.am | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/cpukit/zlib/zconf.h.in b/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 |