--- qdgdf/config.sh
+++ qdgdf/config.sh
@@ -127,11 +127,12 @@ echo "#include <X11/keysym.h>" >> .tmp.c
 echo "#include <sys/time.h>" >> .tmp.c
 echo "int main(void) { XOpenDisplay(NULL); return 0; }" >> .tmp.c
 
-TMP_CFLAGS="-I/usr/X11R6/include"
-TMP_LDFLAGS="-L/usr/X11R6/lib -lXext -lX11 -lm"
+TMP_CFLAGS="-I/usr/X11R7/include"
+TMP_LDFLAGS="-L/usr/X11R7/lib -lXext -lX11 -lm -Wl,-rpath,/usr/X11R7/lib"
 $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2> .config.log
 if [ $? = 0 ] ; then
     echo "#define CONFOPT_X11 1" >> config.h
+    echo $TMP_CFLAGS >> config.cflags
     echo $TMP_LDFLAGS >> config.ldflags
     echo "OK"
     VIDEO_DRIVERS="$VIDEO_DRIVERS x11"
@@ -425,7 +426,7 @@ TRY_AUDIO_DRIVERS="#define TRY_AUDIO_DRIVERS() ("
 echo >> config.h
 for drv in $AUDIO_DRIVERS ; do
     echo "struct _qdgdfa_driver * ${drv}_drv_detect(void);" >> config.h
-    TRY_AUDIO_DRIVERS="$TRY_AUDIO_DRIVERS (drv = ${drv}_drv_detect()) || "
+    TRY_AUDIO_DRIVERS="$TRY_AUDIO_DRIVERS "
 done
 
 echo $TRY_AUDIO_DRIVERS '0)' >> config.h