--- configure.orig	2014-03-18 03:42:33.000000000 +0900
+++ configure	2014-03-18 03:57:27.000000000 +0900
@@ -1048,6 +1048,7 @@
 with_x
 enable_pulseaudio
 enable_lqt
+enable_v4lconvert
 enable_libvisual
 enable_libcdio
 enable_musicbrainz
@@ -13247,7 +13248,7 @@
   GMERLIN_DEP_RPATH=""
 fi
 
-LDFLAGS="$GMERLIN_DEP_RPATH"
+LDFLAGS="$LDFLAGS $GMERLIN_DEP_RPATH"
 
 
 
@@ -15396,9 +15397,9 @@
 V4LCONVERT_REQUIRED="0.5.7"
 have_v4lconvert=false
 
-# Check whether --enable-lqt was given.
-if test "${enable_lqt+set}" = set; then :
-  enableval=$enable_lqt; case "${enableval}" in
+# Check whether --enable-v4lconvert was given.
+if test "${enable_v4lconvert+set}" = set; then :
+  enableval=$enable_v4lconvert; case "${enableval}" in
                  yes) test_v4lconvert=true ;;
                  no) test_v4lconvert=false ;;
                esac
@@ -17345,7 +17346,7 @@
 case $host_cpu in
   i[3-7]86)
     lqt_cpu_family=x86;;
-  x86_64*)
+  amd64* | x86_64*)
     lqt_cpu_family=x86;;
   powerpc | powerpc64)
     lqt_cpu_family=ppc;;
@@ -17520,7 +17521,7 @@
 $as_echo "IA32" >&6; }
     ARCH_X86=true
     ;;
-  x86_64*)
+  amd64* | x86_64*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: x86_64" >&5
 $as_echo "x86_64" >&6; }
     ARCH_X86=true