--- mplayer-export-2007-04-21.orig/configure	2007-04-21 02:57:09.000000000 +0800
+++ mplayer-export-2007-04-21/configure	2007-04-22 08:28:00.000000000 +0800
@@ -6378,19 +6378,16 @@
 echocheck "AMR narrowband"
 if test "$_amr_nb" = auto ; then
   _amr_nb=no
-  cat > $TMPC << EOF
-#include <amrnb/interf_dec.h>
-int main(void) { Speech_Decode_Frame_init(); return 0; }
-EOF
-  cc_check -lamrnb && _amr_nb=yes
-  if test "$_libavcodec" != yes ; then
-    _amr_nb=no
-    _res_comment="libavcodec (static) is required by amr_nb, sorry"
+  if test -f libavcodec/amrnb/sp_dec.c ; then
+    if test "$_libavcodec" = yes ; then
+      _amr_nb=yes
+    else
+      _res_comment="libavcodec (static) is required by amr_nb, sorry"
+    fi
   fi
 fi
 if test "$_amr_nb" = yes ; then
   _amr=yes
-  _ld_extra="$_ld_extra -lamrnb"
   _def_amr='#define CONFIG_AMR 1'
   _def_amr_nb='#define CONFIG_AMR_NB 1'
 else
@@ -6431,19 +6428,16 @@
 echocheck "AMR wideband"
 if test "$_amr_wb" = auto ; then
   _amr_wb=no
-  cat > $TMPC << EOF
-#include <amrwb/dec_if.h>
-int main(void) { D_IF_init(); return 0; }
-EOF
-  cc_check -lamrwb && _amr_wb=yes
-  if test "$_libavcodec" != yes ; then
-    _amr_wb=no
-    _res_comment="libavcodec (static) is required by amr_wb, sorry"
+  if test -f libavcodec/amrwb/dec_dtx.c ; then
+    if test "$_libavcodec" = yes ; then
+      _amr_wb=yes
+    else
+      _res_comment="libavcodec (static) is required by amr_wb, sorry"
+    fi
   fi
 fi
 if test "$_amr_wb" = yes ; then
   _amr=yes
-  _ld_extra="$_ld_extra -lamrwb"
   _def_amr='#define CONFIG_AMR 1'
   _def_amr_wb='#define CONFIG_AMR_WB 1'
   _codecmodules="amr_wb $_codecmodules"
--- mplayer-export-2007-04-21.orig/libavcodec/Makefile	2007-04-21 08:29:01.000000000 +0800
+++ mplayer-export-2007-04-21/libavcodec/Makefile	2007-04-22 08:38:27.000000000 +0800
@@ -271,11 +271,33 @@
 OBJS-$(CONFIG_XVID)                    += xvidff.o xvid_rc.o
 
 OBJS-$(CONFIG_AMR)                     += amr.o
+OBJS-$(CONFIG_AMR_NB)                  += amrnb/sp_dec.o     \
+                                          amrnb/sp_enc.o     \
+                                          amrnb/interf_dec.o \
+                                          amrnb/interf_enc.o
+
 ifeq ($(CONFIG_AMR_NB_FIXED),yes)
 EXTRAOBJS += amr/*.o
 EXTRADEPS=amrlibs
 endif
 
+OBJS-$(CONFIG_AMR_WB)                  += amrwb/dec_acelp.o \
+                                          amrwb/dec_dtx.o   \
+                                          amrwb/dec_gain.o  \
+                                          amrwb/dec_if.o    \
+                                          amrwb/dec_lpc.o   \
+                                          amrwb/dec_main.o  \
+                                          amrwb/dec_rom.o   \
+                                          amrwb/dec_util.o  \
+                                          amrwb/enc_acelp.o \
+                                          amrwb/enc_dtx.o   \
+                                          amrwb/enc_gain.o  \
+                                          amrwb/enc_if.o    \
+                                          amrwb/enc_lpc.o   \
+                                          amrwb/enc_main.o  \
+                                          amrwb/enc_rom.o   \
+                                          amrwb/enc_util.o  \
+                                          amrwb/if_rom.o
 
 OBJS-$(CONFIG_AAC_PARSER)              += parser.o
 OBJS-$(CONFIG_AC3_PARSER)              += parser.o ac3.o
--- mplayer-export-2007-04-21.orig/libavcodec/amr.c	2007-04-18 17:34:08.000000000 +0800
+++ mplayer-export-2007-04-21/libavcodec/amr.c	2007-04-22 08:28:05.000000000 +0800
@@ -77,8 +77,8 @@
 #include "amr/e_homing.h"
 
 #else
-#include <amrnb/interf_dec.h>
-#include <amrnb/interf_enc.h>
+#include "amrnb/interf_dec.h"
+#include "amrnb/interf_enc.h"
 #endif
 
 static const char *nb_bitrate_unsupported =
@@ -527,9 +527,9 @@
 #define typedef_h
 #endif
 
-#include <amrwb/enc_if.h>
-#include <amrwb/dec_if.h>
-#include <amrwb/if_rom.h>
+#include "amrwb/enc_if.h"
+#include "amrwb/dec_if.h"
+#include "amrwb/if_rom.h"
 
 /* Common code for fixed and float version*/
 typedef struct AMRWB_bitrates