RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

zlib: Do not generate zconf.h

Browse Source 
Update #3254.
This commit is contained in:
Sebastian Huber
2017-12-13 09:23:04 +01:00
parent 94e04b533d
commit 241fc046a7
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpukit/zlib/zconf.h.in → cpukit/include/zconf.h
View File

@@ -12,7 +12,7 @@
* Even better than compiling with -DZ_PREFIX would be to use configure to set * Even better than compiling with -DZ_PREFIX would be to use configure to set
* this permanently in zconf.h using "./configure --zprefix". * 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 */ /* all linked symbols */
# define _dist_code z__dist_code # define _dist_code z__dist_code
@@ -354,7 +354,7 @@ typedef uLong FAR uLongf;
typedef Byte *voidp; typedef Byte *voidp;
#endif #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 # define Z_HAVE_UNISTD_H
#endif #endif

8
cpukit/zlib/Makefile.am
View File

@@ -20,13 +20,5 @@ libz_a_SOURCES += zutil.c zutil.h
include_HEADERS = zlib.h zconf.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 $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am include $(top_srcdir)/automake/local.am