*** converter/other/Makefile.ORIG	Thu May  8 16:59:49 2008
--- converter/other/Makefile	Thu May  8 16:18:48 2008
***************
*** 159,165 ****
  pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
  	$(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \
  	  $(shell $(LIBOPT) $(NETPBMLIB)) \
! 	  $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
  
  pamrgbatopng: %: %.o $(NETPBMLIB) $(LIBOPT)
  	$(LD) $(LDFLAGS) -o $@ $@.o \
--- 159,165 ----
  pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
  	$(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \
  	  $(shell $(LIBOPT) $(NETPBMLIB)) \
! 	  $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) -lz
  
  pamrgbatopng: %: %.o $(NETPBMLIB) $(LIBOPT)
  	$(LD) $(LDFLAGS) -o $@ $@.o \
*** other/pamx/image.h.ORIG	Thu May  8 13:24:15 2008
--- other/pamx/image.h	Thu May  8 13:24:13 2008
***************
*** 1,6 ****
--- 1,8 ----
  #ifndef IMAGE_H_INCLUDED
  #define IMAGE_H_INCLUDED
+ #ifndef _AIX
  #include <strings.h>
+ #endif
  
  #include "pm_c_util.h"
  
*** other/pamx/window.c.ORIG	Thu May  8 13:24:44 2008
--- other/pamx/window.c	Thu May  8 13:24:56 2008
***************
*** 13,19 ****
--- 13,21 ----
  #include <sys/types.h>
  #include <X11/cursorfont.h>
  #include <X11/Xatom.h>
+ #ifndef _AIX
  #include <X11/Xdefs.h>  /* Needed by Xutil.h */
+ #endif
  #include <X11/X.h>      /* Needed by Xutil.h */
  #include <X11/Xlib.h>   /* Needed by Xutil.h */
  #include <X11/Xutil.h>
*** buildtools/configure.pl.ORIG	Thu May  8 21:33:19 2008
--- buildtools/configure.pl	Thu May  8 21:33:43 2008
***************
*** 1891,1897 ****
          # above does NOT work for HP native compiler.
      }
  } elsif ($platform eq "AIX") {
!     push(@Makefile_config, 'LDFLAGS = -L /usr/pubsw/lib', "\n");
      if ($compiler eq "cc") {
          # Yes, the -L option implies the runtime as well as linktime library
          # search path.  There's no way to specify runtime path independently.
--- 1891,1897 ----
          # above does NOT work for HP native compiler.
      }
  } elsif ($platform eq "AIX") {
!     push(@Makefile_config, 'LDFLAGS = -L /opt/freeware/lib', "\n");
      if ($compiler eq "cc") {
          # Yes, the -L option implies the runtime as well as linktime library
          # search path.  There's no way to specify runtime path independently.