*** configure.in.ORIG	Thu Jan 31 22:32:45 2008
--- configure.in	Thu Jan 31 22:33:10 2008
***************
*** 10,16 ****
  
  AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
  
! CFLAGS=${CFLAGS:-"-O2 -Wall"}
  
  AC_PROG_CC
  AC_PROG_CXX
--- 10,16 ----
  
  AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
  
! dnl CFLAGS=${CFLAGS:-"-O2 -Wall"}
  
  AC_PROG_CC
  AC_PROG_CXX
***************
*** 31,41 ****
  
  AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
                 AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
!                             external_mp4v2=no, -lstdc++),
                 external_mp4v2=no, [#include <mp4.h>])
  
  if test x$external_mp4v2 = xyes; then
    AC_MSG_NOTICE([*** Building with external mp4v2 ***])
  else
    if test x$WITHMP4V2 = xyes; then
       AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
--- 31,43 ----
  
  AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
                 AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
!                             external_mp4v2=no),
                 external_mp4v2=no, [#include <mp4.h>])
  
  if test x$external_mp4v2 = xyes; then
    AC_MSG_NOTICE([*** Building with external mp4v2 ***])
+   MY_DEFINE(HAVE_LIBMP4V2)
+   LIBS="-lmp4v2 $LIBS"
  else
    if test x$WITHMP4V2 = xyes; then
       AC_MSG_NOTICE([*** Building with internal mp4v2 ***])