--- ./pnm/pnmtopng.c Mon Dec 17 17:05:22 2001 +++ ../netpbm-9.25/./pnm/pnmtopng.c Wed Apr 24 18:44:10 2002 @@ -326,6 +326,7 @@ *retvalP = pm_maxvaltobits(maxval); if (maxval == 65535) { + mayscale = TRUE; pm_seek(ifp, imagepos); for (y = 0 ; y < rows && mayscale ; y++) { pnm_readpnmrow(ifp, xelrow, cols, maxval, format); @@ -413,6 +414,7 @@ *retvalP = pm_maxvaltobits(maxval); if (maxval == 65535) { + mayscale = TRUE; pm_seek(ifp, imagepos); for (y = 0 ; y < rows && mayscale ; y++) { pnm_readpnmrow(ifp, xelrow, cols, maxval, format); --- ./Makefile.common Thu Mar 14 10:22:20 2002 +++ ../netpbm-9.25/./Makefile.common Wed Apr 24 16:58:59 2002 @@ -185,6 +185,22 @@ SONAME = lib$(LIBROOT).so.$(MAJ) +ifeq ($(NETPBMLIBTYPE),irixshared) +# The libxxx.so link is needed to link the executables. +lib$(LIBROOT).$(NETPBMLIBSUFFIX): $(SONAME) + rm -f $@ + $(SYMLINK) $< $@ +# The $(SONAME) link is only needed to test the programs without +# installing the libraries (in that case, you also need to direct the +# dynamic linker to the source directories, e.g. set LD_LIBRARYN32_PATH). +$(SONAME): \ + $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) + $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ + `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG) \ + -rpath $(INSTALLLIBS) -soname lib$(LIBROOT).$(NETPBMLIBSUFFIX) \ + -set_version `perl -e 'print "sgi$(MAJ).".join(":sgi$(MAJ).",(0..$(MIN)))."\n"'` +endif + ifeq ($(NETPBMLIBTYPE),unixshared) # The libxxx.so link is needed to link the executables. lib$(LIBROOT).$(NETPBMLIBSUFFIX): $(SONAME) --- ./pm_config.h Wed Jan 16 18:14:55 2002 +++ ../netpbm-9.25/./pm_config.h Wed Apr 24 17:19:14 2002 @@ -250,7 +250,11 @@ */ #ifndef __GNUC__ #ifndef __inline__ +#ifdef __sgi +#define __inline__ __inline +#else #define __inline__ +#endif #endif #endif --- ./configure Thu Mar 14 10:27:00 2002 +++ ../netpbm-9.25/./configure Wed Apr 24 17:09:04 2002 @@ -250,7 +250,11 @@ $netpbmlibsuffix = "dylib"; $shlibprefixlist = "lib"; } else { - $netpbmlibtype = "unixshared"; + if ($platform eq "IRIX") { + $netpbmlibtype = "irixshared"; + } else { + $netpbmlibtype = "unixshared"; + } if ($platform eq "AIX") { $netpbmlibsuffix = "a"; } elsif ($platform eq "HP-UX") { @@ -277,7 +281,9 @@ my $staticlib_too; -if ($netpbmlibtype eq "unixshared" or $netpbmlibtype eq "dll") { +if ($netpbmlibtype eq "unixshared" or + $netpbmlibtype eq "irixshared" or + $netpbmlibtype eq "dll") { print("Do you want to build static libraries too (for linking to \n"); print("programs not in the Netpbm package?\n"); print("\n"); @@ -562,6 +568,10 @@ push(@Makefile_config, 'CFLAGS = -n32 -O3', "\n"); push(@Makefile_config, 'LDFLAGS = -n32', "\n"); push(@Makefile_config, 'LDSHLIB = -shared -n32', "\n"); + push(@Makefile_config, 'TIFFLIB_DIR = /usr/lib32', "\n"); + push(@Makefile_config, 'JPEGLIB_DIR = /usr/lib32', "\n"); + push(@Makefile_config, 'PNGLIB_DIR = /usr/lib32', "\n"); + push(@Makefile_config, 'ZLIB_DIR = /usr/lib32', "\n"); } elsif ($platform eq "WINDOWS") { # Until 9.15 (June 2001), we set MANCP here because it appeared that DJGPP # required it. Now I'm not sure.