[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeartwork/kscreensaver/kxsconfig
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-07-06 12:08:44
Message-ID: 20040706120844.ABD7025FB () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

the ever moving xscreensaver


  M +27 -31    configure.in.in   1.7


--- kdeartwork/kscreensaver/kxsconfig/configure.in.in  #1.6:1.7
@@ -1,3 +1,13 @@
-xscreensaver_prefixes="$exec_prefix $prefix /usr /usr/local /opt/local /usr/X11R6 \
/usr/X11R6 /opt/kde /opt/kde3 /usr/kde /usr/local/kde /usr/local/xscreensaver \
/usr/openwin/lib/xscreensaver" +AC_DEFUN([KDE_CHECK_XSREENSAVER],
+[
+     XSCREENSAVER_CONFIG=NO
+     AC_FIND_FILE($1/flame.xml, [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
+     if test "$XSCREENSAVER_CONFIG" != NO; then
+        XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/$1"
+     fi
+])
+
+
+xscreensaver_prefixes="$exec_prefix $prefix /usr /usr/local /opt/local /usr/X11R6 \
/usr/X11R6 /opt/kde /opt/kde3 /usr/kde /usr/local/kde /usr/local/xscreensaver \
/usr/openwin/lib/xscreensaver /etc"  
 old_IFS=$IFS
@@ -13,6 +23,7 @@
 IFS=$old_IFS
 
-KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, 
-        [ $xscreensaver_prefixes ],
+KDE_FIND_PATH(lib$kdesuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes \
], +   [
+        KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes \
],  [
             KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, 
@@ -26,4 +37,5 @@
               ])
         ])
+   ])
 
 XSCREENSAVER_HACKS_DIR=
@@ -34,32 +46,16 @@
 
      AC_MSG_CHECKING([for flame.xml])
-     AC_FIND_FILE(lib/xscreensaver/config/flame.xml, [ $xscreensaver_prefixes ], \
                XSCREENSAVER_CONFIG)
-     if test "$XSCREENSAVER_CONFIG" = NO; then
-        AC_FIND_FILE(lib/X11/xscreensaver/config/flame.xml, [ $xscreensaver_prefixes \
                ],
-                XSCREENSAVER_CONFIG)
-        if test "$XSCREENSAVER_CONFIG" = NO; then
-                AC_FIND_FILE(share/control-center/screensavers/flame.xml,
-                        [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
-                if test "$XSCREENSAVER_CONFIG" != NO; then
-                    \
                XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/control-center/screensavers/"
                
-                else
-                    AC_FIND_FILE(share/xscreensaver/config/flame.xml,
-                                 [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
-                    if test "$XSCREENSAVER_CONFIG" != NO; then
-                        \
                XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config/"
-                    else
-                        AC_FIND_FILE(config/control-center-2.0/flame.xml,
-                                 [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
-                        if test "$XSCREENSAVER_CONFIG" != NO; then
-                             \
                XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/config/control-center-2.0/"
-                        fi
-                    fi
-                fi
-        else
-             XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
-        fi
-     else
-        XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
-     fi
+     for subdir in lib/xscreensaver/config \
+                   lib/X11/xscreensaver/config \
+                   share/control-center/screensavers \
+                   share/control-center/screensavers \
+                   share/xscreensaver/config \
+                   xscreensaver \
+                   config/control-center-2.0; do
+         KDE_CHECK_XSREENSAVER($subdir)
+         if test "$XSCREENSAVER_CONFIG" != NO; then
+                break
+         fi
+     done
      AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
      AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", 


[prev in list] [next in list] [prev in thread] [next in thread]