Index: config/mkmainlib.inc.in --- config/mkmainlib.inc.in.orig 2006-10-30 22:21:53 +0100 +++ config/mkmainlib.inc.in 2006-11-01 12:09:24 +0100 @@ -29,7 +29,7 @@ @-if test "$(WITH_SHARED)" = "no"; then \ cp .libs/$(MAINLIBNAME) .libs/$(MAINLIBNAME)i;\ fi - $(LIBTOOL) $(INSTALL_DATA) $(MAINLIBNAME) $(libdir); + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(MAINLIBNAME) $(libdir); @-if test "$(WITH_SHARED)" = "yes"; then \ $(LIBTOOL) -n --finish $(libdir);\ else\ Index: configure --- configure.orig 2006-10-30 22:21:53 +0100 +++ configure 2006-11-01 12:09:24 +0100 @@ -9152,6 +9152,7 @@ # zlib +if [ ".$FLATELIBINC" = . -a ".$FLATELIBLINK" = . ]; then if test -d libs/flate ; then FLATELIBINC="-I\$(top_builddir)/libs/flate" FLATELIBLINK="\$(top_builddir)/libs/flate/libz\$(LA)" @@ -9160,10 +9161,12 @@ FLATELIBINC="" FLATELIBLINK="" fi +fi # pnglib +if [ ".$PNGLIBINC" = . -a ".$PNGLIBLINK" = . ]; then if test -d libs/png ; then PNGLIBINC="-I\$(top_builddir)/libs/png" PNGLIBLINK="\$(top_builddir)/libs/png/libpng\$(LA)" @@ -9172,10 +9175,12 @@ PNGLIBINC="" PNGLIBLINK="" fi +fi # tifflib +if [ ".$TIFFLIBINC" = . -a ".$TIFFLIBLINK" = . ]; then if test -d libs/tiff ; then TIFFLIBINC="-I\$(top_builddir)/libs/tiff" TIFFLIBLINK="\$(top_builddir)/libs/tiff/libtiff\$(LA)" @@ -9184,10 +9189,12 @@ TIFFLIBINC="" TIFFLIBLINK="" fi +fi # jpeglib +if [ ".$JPEGLIBINC" = . -a ".$JPEGLIBLINK" = . ]; then if test -d libs/jpeg ; then JPEGLIBINC="-I\$(top_builddir)/libs/jpeg" JPEGLIBLINK="\$(top_builddir)/libs/jpeg/libjpeg\$(LA)" @@ -9196,6 +9203,7 @@ JPEGLIBINC="" JPEGLIBLINK="" fi +fi Index: libs/tiff/tif_ojpeg.c --- libs/tiff/tif_ojpeg.c.orig 2006-10-30 22:22:01 +0100 +++ libs/tiff/tif_ojpeg.c 2006-11-01 12:09:24 +0100 @@ -141,7 +141,9 @@ #undef JPEG_INTERNALS /* Hack for files produced by Wang Imaging application on Microsoft Windows */ +#if 0 extern void jpeg_reset_huff_decode(j_decompress_ptr); +#endif /* PDFlib GmbH */ #if defined(__ia64__) && defined (__linux__) @@ -1110,7 +1112,9 @@ "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we invoke that interface here after decoding each "strip". */ +#if 0 if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d); +#endif return 1; } @@ -1209,7 +1213,9 @@ "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we invoke that interface here after decoding each "strip". */ +#if 0 if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d); +#endif return 1; }