*** common/mp4v2/Makefile.in.ORIG	Tue Jul 14 15:56:22 2009
--- common/mp4v2/Makefile.in	Tue Jul 14 15:56:32 2009
***************
*** 212,218 ****
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  INCLUDES = -I$(top_srcdir)/include
! AM_CXXFLAGS = -Wall
  noinst_LIBRARIES = libmp4v2.a 
  noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
  libmp4v2_a_SOURCES = \
--- 212,218 ----
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  INCLUDES = -I$(top_srcdir)/include
! AM_CXXFLAGS =
  noinst_LIBRARIES = libmp4v2.a 
  noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
  libmp4v2_a_SOURCES = \
*** common/mp4v2/mpeg4ip.h.ORIG	Tue Jul 14 16:05:38 2009
--- common/mp4v2/mpeg4ip.h	Tue Jul 14 16:05:58 2009
***************
*** 203,208 ****
--- 203,212 ----
  #define __STRING(expr) #expr
  #endif
  
+ #ifdef _AIX
+ #define __STRING(expr) #expr
+ #endif
+ 
  #ifndef HAVE_STRSEP
  #ifdef __cplusplus
  extern "C" {
*** configure.ORIG	Tue Jul 14 16:19:29 2009
--- configure	Tue Jul 14 16:19:57 2009
***************
*** 2419,2425 ****
  
  
  
! CFLAGS=${CFLAGS:-"-O2 -Wall"}
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
--- 2419,2425 ----
  
  
  
! #CFLAGS=${CFLAGS:-"-O2 -Wall"}
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
***************
*** 19731,19737 ****
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lmp4v2 -lstdc++ $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 19731,19737 ----
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lmp4v2 $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 19864,19870 ****
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lmp4v2 -lstdc++ $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 19864,19870 ----
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lmp4v2 $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF