Summary: | xscreensaver directory structure on Solaris 9 | ||
---|---|---|---|
Product: | kscreensaver | Reporter: | Lars Tunkrans <lars.tunkrans> |
Component: | general | Assignee: | kscreensaver bugs tracking <kscreensaver-bugs-null> |
Status: | RESOLVED FIXED | ||
Severity: | wishlist | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | Compiled Sources | ||
OS: | Solaris | ||
Latest Commit: | Version Fixed In: |
Description
Lars Tunkrans
2003-07-12 10:36:15 UTC
Doesn't work either on FreeBSD since XScreensaver hacks are put into /usr/X11R6/bin/xscreensaver-hacks. I'll see if I can understand auto* and fix it.... on FreeBSD flame is in /usr/X11R6/bin/xscreensaver-hacks/xflame and flame.xml is in /usr/X11R6//share/xscreensaver/config/flame.xml Subject: kdeartwork/kscreensaver/kxsconfig CVS commit by coolo: hopefully find freebsd and solaris9's xscreensaver installations CCMAIL: 61127-done@bugs.kde.org M +30 -6 configure.in.in 1.5 --- kdeartwork/kscreensaver/kxsconfig/configure.in.in #1.4:1.5 @@ -1,3 +1,3 @@ -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" +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" old_IFS=$IFS @@ -13,6 +13,17 @@ IFS=$old_IFS -KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ], - [XSCREENSAVER=NO]) +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 + ]) + ]) + ]) XSCREENSAVER_HACKS_DIR= @@ -28,8 +39,20 @@ XSCREENSAVER_CONFIG) if test "$XSCREENSAVER_CONFIG" = NO; then - AC_FIND_FILE(share/control-center/screensavers/flame.xml, + 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/" + 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/flame.xml" + 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/flame.xml" + fi + fi fi else @@ -40,5 +63,6 @@ fi AC_MSG_RESULT([$XSCREENSAVER_CONFIG]) - AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", [Defines where xscreensaver stores it's config files]) + AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", + [Defines where xscreensaver stores it's config files]) fi |