*** ./common/cpu.c.ORIG	Fri Apr  8 00:05:20 2011
--- ./common/cpu.c	Fri Apr  8 00:05:59 2011
***************
*** 300,305 ****
--- 300,312 ----
  
      return X264_CPU_ALTIVEC;
  }
+ 
+ #elif SYS_AIX
+ 
+ uint32_t x264_cpu_detect( void )
+ {
+     return 0;
+ }
  #endif
  
  #elif ARCH_ARM
*** ./x264.c.ORIG	Fri Apr  8 00:06:07 2011
--- ./x264.c	Fri Apr  8 00:06:19 2011
***************
*** 29,35 ****
  
  #include <signal.h>
  #define _GNU_SOURCE
! #include <getopt.h>
  #include "common/common.h"
  #include "x264cli.h"
  #include "input/input.h"
--- 29,35 ----
  
  #include <signal.h>
  #define _GNU_SOURCE
! #include "getopt.h"
  #include "common/common.h"
  #include "x264cli.h"
  #include "input/input.h"
*** ./x264.h.ORIG	Fri Apr  8 00:06:25 2011
--- ./x264.h	Fri Apr  8 00:06:50 2011
***************
*** 28,34 ****
  #ifndef X264_X264_H
  #define X264_X264_H
  
! #if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
      !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)
  # ifdef _MSC_VER
  #  pragma message("You must include stdint.h or inttypes.h before x264.h")
--- 28,34 ----
  #ifndef X264_X264_H
  #define X264_X264_H
  
! #if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_H_STDINT) && \
      !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)
  # ifdef _MSC_VER
  #  pragma message("You must include stdint.h or inttypes.h before x264.h")
*** ./configure.ORIG	Fri Dec 16 15:45:03 2011
--- ./configure	Sat Dec 17 16:04:04 2011
***************
*** 481,486 ****
--- 481,491 ----
          fi
          HAVE_GETOPT_LONG=0
          ;;
+     aix*)
+         SYS="AIX"
+         LDFLAGS="$LDFLAGS -lm"
+         HAVE_GETOPT_LONG=0
+         ;;
      *)
          die "Unknown system $host, edit the configure"
          ;;
***************
*** 875,881 ****
      CFLAGS="$CFLAGS -fPIC"
      ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
!     cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
--- 880,886 ----
      CFLAGS="$CFLAGS -fPIC"
      ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
! #    cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi