*** ./common/cpu.c.ORIG	Thu Feb  3 15:06:05 2011
--- ./common/cpu.c	Thu Feb  3 15:07:44 2011
***************
*** 282,287 ****
--- 282,295 ----
  
      return X264_CPU_ALTIVEC;
  }
+ 
+ #elif SYS_AIX
+ 
+ uint32_t x264_cpu_detect( void )
+ {
+     return 0;
+ }
+ 
  #endif
  
  #elif ARCH_ARM
*** ./x264.c.ORIG	Thu Feb  3 14:38:44 2011
--- ./x264.c	Thu Feb  3 14:40:35 2011
***************
*** 32,38 ****
  
  #include <signal.h>
  #define _GNU_SOURCE
! #include <getopt.h>
  
  #include "common/common.h"
  #include "x264cli.h"
--- 32,38 ----
  
  #include <signal.h>
  #define _GNU_SOURCE
! #include "getopt.h"
  
  #include "common/common.h"
  #include "x264cli.h"
*** ./x264.h.ORIG	Thu Feb  3 14:41:31 2011
--- ./x264.h	Thu Feb  3 14:43:58 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	Thu Feb  3 15:12:12 2011
--- ./configure	Thu Feb  3 15:13:02 2011
***************
*** 325,330 ****
--- 325,335 ----
      LDFLAGS="$LDFLAGS -lm"
      HAVE_GETOPT_LONG=0
      ;;
+   aix*)
+     SYS="AIX"
+     LDFLAGS="$LDFLAGS -lm"
+     HAVE_GETOPT_LONG=0
+     ;;
    *)
      die "Unknown system $host, edit the configure"
      ;;
***************
*** 676,682 ****
      CFLAGS="$CFLAGS -fPIC"
      ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
!     cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
  fi
  
  if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
--- 681,687 ----
      CFLAGS="$CFLAGS -fPIC"
      ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
! #    cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
  fi
  
  if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then