*** xv-3.10a/config.h.ORIG Mon Jan 2 23:53:52 2006 --- xv-3.10a/config.h Mon Jan 2 23:54:32 2006 *************** *** 20,26 **** # ifdef VMS # define GUNZIP "UNCOMPRESS" # else ! # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) # define GUNZIP "/usr/bin/gzip -dq" # else # define GUNZIP "/usr/local/bin/gzip -dq" /* is full path truly needed? */ --- 20,26 ---- # ifdef VMS # define GUNZIP "UNCOMPRESS" # else ! # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) || defined(_AIX) # define GUNZIP "/usr/bin/gzip -dq" # else # define GUNZIP "/usr/local/bin/gzip -dq" /* is full path truly needed? */ *************** *** 60,66 **** #if defined(hpux) || defined(SVR4) || \ defined(__386BSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ ! defined(__linux__) /* I want to use BSD macro for checking if this OS is *BSD or not, but the macro is defined in , which I don't know all --- 60,66 ---- #if defined(hpux) || defined(SVR4) || \ defined(__386BSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ ! defined(__linux__) || defined(_AIX) /* I want to use BSD macro for checking if this OS is *BSD or not, but the macro is defined in , which I don't know all *************** *** 178,184 **** * in the following line. */ ! #undef MACBINARY /*************************************************************************** --- 178,184 ---- * in the following line. */ ! #define MACBINARY /*************************************************************************** *** xv-3.10a/xv.h.ORIG Mon Jan 2 23:53:58 2006 --- xv-3.10a/xv.h Mon Jan 2 23:54:32 2006 *************** *** 344,349 **** --- 344,353 ---- # endif #endif + #ifdef _AIX + #define __S_IWRITE 0000200 /* write permission, owner */ + #endif + #ifndef S_IRWUSR # define S_IRWUSR (S_IRUSR|__S_IWRITE) #endif *** xv-3.10a/Makefile.ORIG Mon Jan 2 23:53:45 2006 --- xv-3.10a/Makefile Tue Jan 3 00:08:55 2006 *************** *** 1,7 **** # Makefile for xv # your C compiler (and options) of choice ! CC = cc #CC = gcc -ansi # note that -ansi kills __USE_MISC (gcc 2.95.3), which (at least in Linux) # determines whether stdlib.h includes prototypes for mktemp(), random(), etc. --- 1,7 ---- # Makefile for xv # your C compiler (and options) of choice ! CC = xlc -qmaxmem=16384 #CC = gcc -ansi # note that -ansi kills __USE_MISC (gcc 2.95.3), which (at least in Linux) # determines whether stdlib.h includes prototypes for mktemp(), random(), etc. *************** *** 18,24 **** # -Wuninitialized -Wparentheses ! CCOPTS = -O # these are the usual optimization and warning options for gcc; all such # warnings but one (mktemp() use) have been eliminated (at least on Linux): #CCOPTS = -O3 -Wall --- 18,25 ---- # -Wuninitialized -Wparentheses ! # we need -ma for inlined alloca on AIX ! CCOPTS = -O2 -ma # these are the usual optimization and warning options for gcc; all such # warnings but one (mktemp() use) have been eliminated (at least on Linux): #CCOPTS = -O3 -Wall *************** *** 41,51 **** ### Installation locations ! PREFIX = /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 MANSUF = 1 ! DOCDIR = $(PREFIX)/doc/xv-3.10a LIBDIR = $(PREFIX)/lib/xv SYSCONFDIR = $(PREFIX)/etc DESTDIR = --- 42,52 ---- ### Installation locations ! PREFIX = /opt/freeware BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 MANSUF = 1 ! DOCDIR = $(PREFIX)/doc/xv-docs-3.10a LIBDIR = $(PREFIX)/lib/xv SYSCONFDIR = $(PREFIX)/etc DESTDIR = *************** *** 63,87 **** ### on your machine, *COMMENT OUT* the following lines ### JPEG = -DDOJPEG ! #JPEGDIR = jpeg ! JPEGDIR = /usr ! #JPEGDIR = /usr/local ! #JPEGDIR = ../../libjpeg ! ### ! JPEGINC = -I$(JPEGDIR)/include ! #JPEGINC = -I$(JPEGDIR) ! ### ! JPEGLIB = -L$(JPEGDIR)/lib -ljpeg ! #JPEGLIB = -L$(JPEGDIR) -ljpeg ! #JPEGLIB = $(JPEGDIR)/libjpeg.a ! ### ! ### this is intended to build the ancient version (5a) that's included in the ! ### "jpeg" subdir of XV, not an arbitrary copy of libjpeg: ! ### ! #$(JPEGDIR)/jconfig.h: ! # cd $(JPEGDIR) ; ./configure CC='$(CC)' ! #$(JPEGLIB): $(JPEGDIR)/jconfig.h ! # cd $(JPEGDIR) ; make ### --- 64,71 ---- ### on your machine, *COMMENT OUT* the following lines ### JPEG = -DDOJPEG ! JPEGINC = -I/opt/freeware/include ! JPEGLIB = -L/opt/freeware/lib -ljpeg ### *************** *** 89,104 **** ### on your machine, *COMMENT OUT* the following lines ### PNG = -DDOPNG ! PNGDIR = /usr ! #PNGDIR = /usr/local ! #PNGDIR = ../../libpng ! ### ! PNGINC = -I$(PNGDIR)/include ! #PNGINC = -I$(PNGDIR) ! ### ! PNGLIB = -L$(PNGDIR)/lib -lpng ! #PNGLIB = -L$(PNGDIR) -lpng ! #PNGLIB = $(PNGDIR)/libpng.a ### --- 73,80 ---- ### on your machine, *COMMENT OUT* the following lines ### PNG = -DDOPNG ! PNGINC = -I/opt/freeware/include ! PNGLIB = -L/opt/freeware/lib/lib -lpng ### *************** *** 106,121 **** ### (newer versions of) the TIFF library to compile on your machine, *COMMENT ### OUT* the following lines ### ! ZLIBDIR = /usr ! #ZLIBDIR = /usr/local ! #ZLIBDIR = ../../zlib ! ### ! ZLIBINC = -I$(ZLIBDIR)/include ! #ZLIBINC = -I$(ZLIBDIR) ! ### ! ZLIBLIB = -L$(ZLIBDIR)/lib -lz ! #ZLIBLIB = -L$(ZLIBDIR) -lz ! #ZLIBLIB = $(ZLIBDIR)/libz.a ### --- 82,89 ---- ### (newer versions of) the TIFF library to compile on your machine, *COMMENT ### OUT* the following lines ### ! ZLIBINC = -I/opt/freeware/include ! ZLIBLIB = -L/opt/freeware/lib -lz ### *************** *** 128,155 **** ### ORIENTATION_BOTLEFT). I don't have a sufficient variety of TIFF test ### images at hand. ### - #TIFF = -DDOTIFF TIFF = -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX ! #TIFFDIR = tiff ! TIFFDIR = /usr ! #TIFFDIR = /usr/local ! #TIFFDIR = ../../libtiff ! ### ! TIFFINC = -I$(TIFFDIR)/include ! #TIFFINC = -I$(TIFFDIR) ! ### ! ### libtiff 3.5 and up may be compiled with zlib and libjpeg, but dependency ! ### is properly handled in LIBS line ~143 lines below ! ### ! TIFFLIB = -L$(TIFFDIR)/lib -ltiff ! #TIFFLIB = -L$(TIFFDIR) -ltiff ! #TIFFLIB = $(TIFFDIR)/libtiff.a ! ### ! ### this is intended to build the ancient version (3.3.016 beta) that's included ! ### in the "tiff" subdir of XV, not an arbitrary copy of libtiff: ! ### ! #$(TIFFLIB): ! # ( cd $(TIFFDIR) ; make CC='$(CC)' COPTS='$(CCOPTS) $(MCHN)' ) ### --- 96,104 ---- ### ORIENTATION_BOTLEFT). I don't have a sufficient variety of TIFF test ### images at hand. ### TIFF = -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX ! TIFFINC = -I/opt/freeware/include ! TIFFLIB = -L/opt/freeware/lib -ltiff ### *************** *** 165,171 **** # if you are running on a SysV-based machine, such as HP, Silicon Graphics, # Solaris, etc.; uncomment one of the following lines to get you *most* of # the way there. SYSV means System V R3. ! # UNIX = -DSVR4 # UNIX = -DSYSV --- 114,120 ---- # if you are running on a SysV-based machine, such as HP, Silicon Graphics, # Solaris, etc.; uncomment one of the following lines to get you *most* of # the way there. SYSV means System V R3. ! UNIX = -DSVR4 # UNIX = -DSYSV *************** *** 353,358 **** --- 302,310 ---- install: all + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(MANDIR) + mkdir -p $(DESTDIR)$(DOCDIR) cp xv bggen vdcomp xcmap xvpictoppm $(DESTDIR)$(BINDIR) cp docs/xv.man $(DESTDIR)$(MANDIR)/xv.$(MANSUF) cp docs/bggen.man $(DESTDIR)$(MANDIR)/bggen.$(MANSUF) *************** *** 359,365 **** cp docs/xcmap.man $(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) cp docs/xvp2p.man $(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) cp docs/vdcomp.man $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF) ! cp docs/xvdocs.ps* $(DESTDIR)$(LIBDIR) # or $(DESTDIR)$(DOCDIR) #cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx tar: --- 311,317 ---- cp docs/xcmap.man $(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) cp docs/xvp2p.man $(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) cp docs/vdcomp.man $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF) ! cp docs/xvdocs.ps* $(DESTDIR)$(DOCDIR) #cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx tar: