--- zlib-1.2.2.2/Makefile.in.build-fPIC 2005-01-20 00:07:18.581081628 +0100 +++ zlib-1.2.2.2/Makefile.in 2005-01-20 00:07:18.588082684 +0100 @@ -49,6 +49,8 @@ man3dir = ${mandir}/man3 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infback.o inftrees.o inffast.o +PIC_OBJS = $(OBJS:%.o=%.lo) + OBJA = # to use the asm code: make OBJA=match.o @@ -77,8 +79,11 @@ match.o: match.S mv _match.o match.o rm -f _match.s -$(SHAREDLIBV): $(OBJS) - $(LDSHARED) -o $@ $(OBJS) -lc +%.lo: %.c + $(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@ + +$(SHAREDLIBV): $(PIC_OBJS) + $(LDSHARED) -o $@ $(PIC_OBJS) -lc rm -f $(SHAREDLIB) $(SHAREDLIBM) ln -s $@ $(SHAREDLIB) ln -s $@ $(SHAREDLIBM) @@ -89,13 +94,8 @@ example$(EXE): example.o $(LIBS) minigzip$(EXE): minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -install: $(LIBS) - -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi - -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi +install-libs: $(LIBS) -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi - -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi - cp zlib.h zconf.h $(includedir) - chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h cp $(LIBS) $(libdir) cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 @@ -105,11 +105,18 @@ install: $(LIBS) ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ (ldconfig || true) >/dev/null 2>&1; \ fi - cp zlib.3 $(man3dir) - chmod 644 $(man3dir)/zlib.3 # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux +install: install-libs + -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi + -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi + -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi + cp zlib.h zconf.h $(includedir) + chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h + cp zlib.3 $(man3dir) + chmod 644 $(man3dir)/zlib.3 + uninstall: cd $(includedir); \ cd $(libdir); rm -f libz.a; \ --- zlib-1.2.2.2/configure.build-fPIC 2005-01-20 00:07:18.584082081 +0100 +++ zlib-1.2.2.2/configure 2005-01-20 00:08:41.189541666 +0100 @@ -159,10 +159,11 @@ SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext if test $shared -eq 1; then echo Checking for shared library support... # we must test in two steps (cc then ld), required at least on SunOS 4.x - if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && + # XXX rework multiple library build system to not depend on this -fPIC test hack + if test "`($CC -c $SFLAGS -fPIC $test.c) 2>&1`" = "" && test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then CFLAGS="$SFLAGS" - LIBS="$SHAREDLIBV" + LIBS="$LIBS $SHAREDLIBV" echo Building shared library $SHAREDLIBV with $CC. elif test -z "$old_cc" -a -z "$old_cflags"; then echo No shared library support.