*** ./codec/Makefile.am.ORIG	Thu Feb  3 09:40:58 2011
--- ./codec/Makefile.am	Thu Feb  3 09:41:03 2011
***************
*** 1,4 ****
! COMPILERFLAGS = -Wall
  
  if with_sharedlibs
  COMPILERFLAGS += -DOPJ_EXPORTS
--- 1,4 ----
! COMPILERFLAGS =
  
  if with_sharedlibs
  COMPILERFLAGS += -DOPJ_EXPORTS
*** ./common/getopt.c.ORIG	Thu Feb  3 09:42:17 2011
--- ./common/getopt.c	Thu Feb  3 09:43:13 2011
***************
*** 45,51 ****
   optind = 1,			/* index into parent argv vector */
   optopt,			/* character checked for validity */
   optreset;			/* reset getopt */
! const char *optarg;			/* argument associated with option */
  
  typedef struct option
  {
--- 45,51 ----
   optind = 1,			/* index into parent argv vector */
   optopt,			/* character checked for validity */
   optreset;			/* reset getopt */
! char *optarg;			/* argument associated with option */
  
  typedef struct option
  {
***************
*** 71,77 ****
   */
  int getopt(int nargc, char *const *nargv, const char *ostr) {
  #  define __progname nargv[0]
!   static const char *place = EMSG;	/* option letter processing */
    char *oli;			/* option letter list index */
  
    if (optreset || !*place) {	/* update scanning pointer */
--- 71,77 ----
   */
  int getopt(int nargc, char *const *nargv, const char *ostr) {
  #  define __progname nargv[0]
!   static char *place = EMSG;	/* option letter processing */
    char *oli;			/* option letter list index */
  
    if (optreset || !*place) {	/* update scanning pointer */
*** ./libopenjpeg/opj_malloc.h.ORIG	Thu Feb  3 09:37:33 2011
--- ./libopenjpeg/opj_malloc.h	Thu Feb  3 09:37:50 2011
***************
*** 84,90 ****
  	#if defined(__sun)
  		#define HAVE_MEMALIGN
  	/* Linux x86_64 and OSX always align allocations to 16 bytes */
! 	#elif !defined(__amd64__) && !defined(__APPLE__)	
  		#define HAVE_MEMALIGN
  		#include <malloc.h>			
  	#endif
--- 84,90 ----
  	#if defined(__sun)
  		#define HAVE_MEMALIGN
  	/* Linux x86_64 and OSX always align allocations to 16 bytes */
! 	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)	
  		#define HAVE_MEMALIGN
  		#include <malloc.h>			
  	#endif
*** ./libopenjpeg/opj_includes.h.ORIG	Thu Feb  3 09:34:47 2011
--- ./libopenjpeg/opj_includes.h	Thu Feb  3 09:35:25 2011
***************
*** 104,109 ****
--- 104,114 ----
  }
  #endif
  
+ /* AIX5L V5.1 does not have lrintf */
+ #ifdef _AIX51
+ #define lrintf(x) ((long) (x))
+ #endif
+ 
  #include "j2k_lib.h"
  #include "opj_malloc.h"
  #include "event.h"
*** ./Makefile.nix.ORIG	Thu Feb  3 09:30:46 2011
--- ./Makefile.nix	Thu Feb  3 09:31:05 2011
***************
*** 2,8 ****
  include  config.nix
  
  TARGET  = openjpeg
! COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
  
  INCLUDE = -I. -Ilibopenjpeg
  LIBRARIES = -lstdc++
--- 2,8 ----
  include  config.nix
  
  TARGET  = openjpeg
! COMPILERFLAGS = -O
  
  INCLUDE = -I. -Ilibopenjpeg
  LIBRARIES = -lstdc++
*** ./libopenjpeg/Makefile.am.ORIG	Thu Feb  3 10:22:48 2011
--- ./libopenjpeg/Makefile.am	Thu Feb  3 10:23:03 2011
***************
*** 29,35 ****
  dos2unix:
  	@$(DOS2UNIX) $(SRCS) $(INCLS)
  
! COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
  
  if with_sharedlibs
  COMPILERFLAGS += -DOPJ_EXPORTS
--- 29,35 ----
  dos2unix:
  	@$(DOS2UNIX) $(SRCS) $(INCLS)
  
! COMPILERFLAGS = -O
  
  if with_sharedlibs
  COMPILERFLAGS += -DOPJ_EXPORTS
*** ./jp3d/codec/Makefile.am.ORIG	Thu Feb  3 10:30:36 2011
--- ./jp3d/codec/Makefile.am	Thu Feb  3 10:30:46 2011
***************
*** 2,8 ****
  
  USERLIBS =
  INCLUDES = -I. -I../libjp3dvm
! CFLAGS = -Wall $(INCLUDES)
  
  if with_sharedlibs
  CFLAGS += -DOPJ_EXPORTS
--- 2,8 ----
  
  USERLIBS =
  INCLUDES = -I. -I../libjp3dvm
! CFLAGS = $(INCLUDES)
  
  if with_sharedlibs
  CFLAGS += -DOPJ_EXPORTS
*** ./jp3d/libjp3dvm/Makefile.am.ORIG	Thu Feb  3 10:27:19 2011
--- ./jp3d/libjp3dvm/Makefile.am	Thu Feb  3 10:27:27 2011
***************
*** 28,34 ****
  	@$(DOS2UNIX) $(SRCS) $(INCLS)
  
  INCLUDES = -I../.. -I.
! COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
  
  if with_sharedlibs
  COMPILERFLAGS += -DOPJ_EXPORTS
--- 28,34 ----
  	@$(DOS2UNIX) $(SRCS) $(INCLS)
  
  INCLUDES = -I../.. -I.
! COMPILERFLAGS = -O
  
  if with_sharedlibs
  COMPILERFLAGS += -DOPJ_EXPORTS
*** ./mj2/Makefile.am.ORIG	Thu Feb  3 10:26:18 2011
--- ./mj2/Makefile.am	Thu Feb  3 10:26:25 2011
***************
*** 1,4 ****
! COMPILERFLAGS = -Wall
  
  if with_sharedlibs
  COMPILERFLAGS += -DOPJ_EXPORTS
--- 1,4 ----
! COMPILERFLAGS =
  
  if with_sharedlibs
  COMPILERFLAGS += -DOPJ_EXPORTS