--- configure.in.orig	2008-02-24 07:12:40.000000000 +0100
+++ configure.in	2008-03-09 19:32:24.000000000 +0100
@@ -40,32 +40,32 @@
 AC_SUBST(LIBDV_CFLAGS)
 AC_SUBST(LIBDV_LIBS)
 
-PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.0.0, AC_DEFINE(HAVE_LIBRAW1394, 1, [libraw1394 present]))
-AC_SUBST(LIBRAW1394_CFLAGS)
-AC_SUBST(LIBRAW1394_LIBS)
+#PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.0.0, AC_DEFINE(HAVE_LIBRAW1394, 1, [libraw1394 present]))
+#AC_SUBST(LIBRAW1394_CFLAGS)
+#AC_SUBST(LIBRAW1394_LIBS)
 LIBS="$LIBS $LIBRAW1394_LIBS -lm"
 CFLAGS="$CFLAGS $LIBRAW1394_CFLAGS"
 
 # LIBAVC1394 and LIBROM1394
-AC_CHECK_HEADER([libavc1394/avc1394.h], ,
-	[AC_MSG_ERROR([avc1394.h not found, install libavc1394-devel])
-])
-AC_CHECK_LIB(avc1394, avc1394_vcr_record, ,
-	[AC_MSG_ERROR([Unable to link with libavc1394. Check that you have libavc1394 installed and that the version is 0.4.1 or newer])]
-)
-AC_CHECK_HEADER([libavc1394/rom1394.h], ,
-	[AC_MSG_ERROR([rom1394.h not found, install libavc1394-devel])
-])
-AC_CHECK_LIB(rom1394, rom1394_get_node_type, ,
-	[AC_MSG_ERROR([Unable to link with librom1394. Check that your have librom1394 installed (usually part of libavc1394) and that the version is 0.4.1 or newer])]
-)
-
-AC_CHECK_LIB(pthread, pthread_create, ,
-	[AC_MSG_ERROR([You need the pthread library to compile kino])]
-)
-AC_CHECK_LIB(dl, dlopen, ,
-	[AC_MSG_ERROR([You need libdl to compile kino])]
-)
+#AC_CHECK_HEADER([libavc1394/avc1394.h], ,
+#	[AC_MSG_ERROR([avc1394.h not found, install libavc1394-devel])
+#])
+#AC_CHECK_LIB(avc1394, avc1394_vcr_record, ,
+#	[AC_MSG_ERROR([Unable to link with libavc1394. Check that you have libavc1394 installed and that the version is 0.4.1 or newer])]
+#)
+#AC_CHECK_HEADER([libavc1394/rom1394.h], ,
+#	[AC_MSG_ERROR([rom1394.h not found, install libavc1394-devel])
+#])
+#AC_CHECK_LIB(rom1394, rom1394_get_node_type, ,
+#	[AC_MSG_ERROR([Unable to link with librom1394. Check that your have librom1394 installed (usually part of libavc1394) and that the version is 0.4.1 or newer])]
+#)
+
+#AC_CHECK_LIB(pthread, pthread_create, ,
+#	[AC_MSG_ERROR([You need the pthread library to compile kino])]
+#)
+#AC_CHECK_LIB(dl, dlopen, ,
+#	[AC_MSG_ERROR([You need libdl to compile kino])]
+#)
 
 # LIBIEC61883
 AC_ARG_WITH(dv1394, AC_HELP_STRING([--with-dv1394],[Use dv1394 instead of libiec61883 for DV I/O (only if you must).]))
@@ -187,11 +187,11 @@
 			tar -xzf ffmpeg-svn-r12186.tar.gz
 		fi
 		if ! (test -f ffmpeg/config.mak) ; then
-			pushd ffmpeg
+			(cd ffmpeg
 			./configure --disable-ffserver --disable-ffplay --disable-network --disable-zlib \
 			--disable-vhook --build-suffix=-kino --enable-gpl --enable-swscaler --enable-pthreads \
 			--prefix="$prefix"
-			popd
+			)
 		fi
 	fi
 ])
@@ -341,8 +341,8 @@
 # This is a feature of the GNU libc that is documented at e.g.
 # http://www.gnu.org/software/libc/manual/html_node/Backtraces.html
 # ######################################################################
-AC_CHECK_HEADER(execinfo.h, [AC_DEFINE(HAVE_EXECINFO_H, 1, Wheter or not execinfo.h is present)
-	EXTRA_LIBS="$EXTRA_LIBS -rdynamic"])
+#AC_CHECK_HEADER(execinfo.h, [AC_DEFINE(HAVE_EXECINFO_H, 1, Wheter or not execinfo.h is present)
+#	EXTRA_LIBS="$EXTRA_LIBS -rdynamic"])
 
 # ######################################################################
 # libsamplerate