--- a/configure.ac
+++ b/configure.ac
@@ -252,10 +252,10 @@ dnl CFLAGS="$CFLAGS"
 AC_MSG_CHECKING(for lame)
 have_lame="false"
 
-  AC_TRY_RUN([
+  AC_LINK_IFELSE([AC_LANG_SOURCE([
     #include <lame/lame.h>
     #include <stdio.h>
-    main()
+    int main()
     {
     int version_major;
     int version_minor;
@@ -269,7 +269,7 @@ have_lame="false"
       return 1;
     return 0;
     }
-  ],
+  ])],
   [
     # program could be run
     have_lame="true"
@@ -668,10 +668,10 @@ LIBS="$LIBS -lfaac -lm"
 CFLAGS="$CFLAGS"
 
 AC_MSG_CHECKING(for faac)
-AC_TRY_RUN([
+AC_LINK_IFELSE([AC_LANG_SOURCE([
     #include <inttypes.h>
     #include <faac.h>
-    main()
+    int main()
     {
     int samplerate = 44100, num_channels = 2;
     unsigned long input_samples, output_bytes;
@@ -683,7 +683,7 @@ AC_TRY_RUN([
 
     return 0;
     }
-  ],
+  ])],
   [
     # program could be run
     have_faac="true"
@@ -737,10 +737,10 @@ LIBS="$LIBS -lfaad -lm"
 AC_MSG_CHECKING(for neaacdec.h usability for faad2)
 
 
-AC_TRY_RUN([
+AC_LINK_IFELSE([AC_LANG_SOURCE([
     #include <neaacdec.h>
     #include <stdio.h>
-    main()
+    int main()
     {
     int faad_major;
     int faad_minor;
@@ -753,7 +753,7 @@ AC_TRY_RUN([
       return -1;
     return 0;
     }
-  ],
+  ])],
   [
     # program could be run
     have_faad2="true"
@@ -770,10 +770,10 @@ if test "x$have_faad2" != "xtrue"; then
 
 AC_MSG_CHECKING(for faad.h usability for faad2)
 
-AC_TRY_RUN([
+AC_LINK_IFELSE([AC_LANG_SOURCE([
     #include <faad.h>
     #include <stdio.h>
-    main()
+    int main()
     {
     int faad_major;
     int faad_minor;
@@ -786,7 +786,7 @@ AC_TRY_RUN([
       return -1;
     return 0;
     }
-  ],
+  ])],
   [
     # program could be run
     have_faad2="true"
--- a/m4/avcodec.m4
+++ b/m4/avcodec.m4
@@ -53,6 +53,16 @@ AC_TRY_RUN([
   [
     # program could not be run
     AC_MSG_RESULT(failed)
+  ],
+  [
+    # cross compiling, use the pkg-config version
+    test "x$AVCODEC_VERSION" = "x" && AVCODEC_VERSION=`$PKG_CONFIG --modversion libavcodec 2>/dev/null`
+    if test "x$AVCODEC_VERSION" != "x"; then
+      avcodec_ok="true"
+      AC_MSG_RESULT(cross compiling; assumed ok)
+    else
+      AC_MSG_RESULT(failed)
+    fi
   ])
 
 have_avcodec_img_convert="false"