Bug 61127 - xscreensaver directory structure on Solaris 9
Summary: xscreensaver directory structure on Solaris 9
Status: RESOLVED FIXED
Alias: None
Product: kscreensaver
Classification: Miscellaneous
Component: general (show other bugs)
Version: unspecified
Platform: Compiled Sources Solaris
: NOR wishlist
Target Milestone: ---
Assignee: kscreensaver bugs tracking
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-07-12 10:36 UTC by Lars Tunkrans
Modified: 2008-05-19 17:59 UTC (History)
0 users

See Also:
Latest Commit:
Version Fixed In:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Lars Tunkrans 2003-07-12 10:36:15 UTC
Version:            (using KDE KDE 3.1.2)
Installed from:    Compiled From Sources
Compiler:          gcc 3.2.3 
OS:          Solaris

Configure for kdeartwork-3.1.2 cant figure out where the 
  Solaris 9 (04/03)  Xscreensaver files are hiding.


$ find /usr/openwin/lib/xscreensaver -type d
/usr/openwin/lib/xscreensaver
/usr/openwin/lib/xscreensaver/bin
/usr/openwin/lib/xscreensaver/config
/usr/openwin/lib/xscreensaver/config/control-center-2.0
/usr/openwin/lib/xscreensaver/config/control-center-2.0/screensavers
/usr/openwin/lib/xscreensaver/hacks

 The screensavers are all in
  /usr/openwin/lib/xscreensaver/hacks
  ( i.e. the flame file sought by configure is in hacks ) 


 The xml descriptions are in 
 /usr/openwin/lib/xscreensaver/config/control-center-2.0



The kdeartwork  configure script needs to be updated with
these directory paths. At the moment /usr/openwin is 
compleatly missing from the xscreensaver_prefixes
variable.

I also had to "hack" the hacks & control-center-2.0 subdirs into 
configure to make it work.

$ diff configure new_configure

< 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"
24852,24853c24852,24853
<    echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
< echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
---
>    echo "$as_me:$LINENO: checking for lib/xscreensaver/hacks/flame" >&5
> echo $ECHO_N "checking for lib/xscreensaver/hacks/flame... $ECHO_C" >&6
24857c24857
<         kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
---
>         kde_cache=`echo lib/xscreensaver/hacks/flame | sed 'y%./+-%__p_%'`
24873c24873
<         if test -x "$dir/lib/xscreensaver/flame"; then
---
>         if test -x "$dir/lib/xscreensaver/hacks/flame"; then
24876c24876
<               evalstr="$dir/lib/xscreensaver/flame  2>&1 "
---
>               evalstr="$dir/lib/xscreensaver/hacks/flame  2>&1 "
24878c24878
<                 kde_cv_path="$dir/lib/xscreensaver/flame"
---
>                 kde_cv_path="$dir/lib/xscreensaver/hacks/flame"
24882c24882
<               kde_cv_path="$dir/lib/xscreensaver/flame"
---
>               kde_cv_path="$dir/lib/xscreensaver/hacks/flame"
24910c24910
< XSCREENSAVER_HACKS_DIR=
---
> XSCREENSAVER_HACKS_DIR=/usr/openwin/lib/xscreensaver/hacks
24926c24926
<   for j in lib/xscreensaver/config/flame.xml;
---
>   for j in lib/xscreensaver/config/control-center-2.0/flame.xml;
24942c24942
<   for j in lib/X11/xscreensaver/config/flame.xml;
---
>   for j in lib/X11/xscreensaver/config/control-center-2.0/flame.xml;
Comment 1 Chris Howells 2003-10-19 13:07:17 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....
Comment 2 Chris Howells 2003-10-19 13:36:50 UTC
on FreeBSD flame is in /usr/X11R6/bin/xscreensaver-hacks/xflame and flame.xml is in /usr/X11R6//share/xscreensaver/config/flame.xml
Comment 3 Stephan Kulow 2003-10-19 14:27:41 UTC
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