diff -Nur kdeartwork-3.4.90.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.90/kscreensaver/kxsconfig/configure.in.in
--- kdeartwork-3.4.90.orig/kscreensaver/kxsconfig/configure.in.in	2005-08-06 11:34:20.000000000 +0200
+++ kdeartwork-3.4.90/kscreensaver/kxsconfig/configure.in.in	2005-08-22 16:46:31.000000000 +0200
@@ -27,32 +27,24 @@
     [enable support for xscreensaver @<:@default=check@:>@])],
   [], with_xscreensaver=check)
 
-XSCREENSAVER=NO
+XSCREENSAVER=''
+echo "Searching in $xscreensaver_prefixes"
 if test "x$with_xscreensaver" != xno; then
-  KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
-   [
-        KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
-        [
-    	    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, 
-  	      [ $xscreensaver_prefixes ],
-	      [
-    	          KDE_FIND_PATH(hacks/flame, XSCREENSAVER, 
-  	          [ $xscreensaver_prefixes ],
-	          [
-		    XSCREENSAVER=NO
-	          ])
-	      ])
-        ])
-   ])
+  for xsdir in lib$kdelibsuff/xscreensaver lib/xscreensaver \
+               lib$kdelibsuff/misc/xscreensaver lib/misc/xscreensaver \
+               bin/xscreensaver-hacks hacks; do
+    test -n "$XSCREENSAVER" && break
+    KDE_FIND_PATH("$xsdir/flame", XSCREENSAVER, [ $xscreensaver_prefixes ])
+  done
 
-  if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = xNO; then
+  if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = x; then
     AC_MSG_FAILURE([--with-xscreensaver was given, but test for xscreensaver failed])
   fi
 fi
 
 XSCREENSAVER_HACKS_DIR=
 
-if test "$XSCREENSAVER" != "NO"; then
+if test -n "$XSCREENSAVER"; then
      XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
      AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
 
@@ -74,6 +66,6 @@
 	[Defines where xscreensaver stores it's config files])
 fi
 
-AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO")
+AM_CONDITIONAL(include_XSCREENSAVER, test -n "$XSCREENSAVER")
 AC_SUBST(XSCREENSAVER_HACKS_DIR)