diff -dupr iulib-0.4.orig/configure.ac iulib-0.4/configure.ac
--- iulib-0.4.orig/configure.ac	2009-12-17 22:11:22.883969299 +0100
+++ iulib-0.4/configure.ac	2009-12-17 22:18:16.749267704 +0100
@@ -54,17 +54,29 @@ AM_CONDITIONAL([have_sdl], [test "$nosdl
 AC_LANG(C++)
 
 # --- vidio (optional video in-/output) ---
-AC_SUBST(novidio, 0)
-AC_CHECK_HEADER(ffmpeg/avcodec.h,,AC_SUBST(novidio, 1))
-AC_CHECK_HEADER(ffmpeg/avformat.h,,AC_SUBST(novidio, 1))
-AC_TRY_COMPILE([#include <ffmpeg/avio.h>
-                #include <ffmpeg/avformat.h>],
-               [AVFormatContext fc; url_fclose(fc.pb);],
-               [], [AC_DEFINE(HAVE_OLD_AVFORMAT)])
+AC_ARG_WITH(vidio,[	--without-vidio			disable vidio],
+    [ac_cv_use_vidio=$withval], [ac_cv_use_vidio=yes])
+	
+if test x$ac_cv_use_vidio != xno; then
+	AC_CHECK_HEADER(libavcodec/avcodec.h,,AC_SUBST(novidio, 1))
+	AC_CHECK_HEADER(libavformat/avformat.h,,AC_SUBST(novidio, 1))
+	AC_TRY_COMPILE([#include <libavformat/avio.h>
+					#include <libavformat/avformat.h>],
+				   [AVFormatContext fc; url_fclose(fc.pb);],
+				   [], [AC_DEFINE(HAVE_OLD_AVFORMAT)])
+else
+	AC_SUBST(novidio, 1)
+fi
 AM_CONDITIONAL([have_vidio], [test "$novidio" != 1])
 
-AC_SUBST(nov4l2, 0)
-AC_CHECK_HEADER(linux/videodev2.h,,AC_SUBST(nov4l2, 1))
+AC_ARG_WITH(v4l2,[	--without-v4l2			disable video4linux2 support],
+    [ac_cv_use_v4l2=$withval], [ac_cv_use_v4l2=yes])
+
+if test x$ac_cv_use_v4l2 != xno; then
+	AC_CHECK_HEADER(linux/videodev2.h,,AC_SUBST(nov4l2, 1))
+else
+	AC_SUBST(nov4l2, 0)
+fi
 AM_CONDITIONAL([have_v4l2], [test "$nov4l2" != 1])
 
 AC_TYPE_INT64_T