Re: sawfish/gnome-session breakage (solved)

[Christopher Roy Bratusek <zanghar freenet de>]

Hi Allin,

thanks for pointing it out, but we do check for smlib, we just did not
define that symbol, so here's a better patch (also replaced some can't
with can not, produces ugly syntax highlighting in editors, no
functionality change):

diff --git a/configure.in b/configure.in
index 02969ff..002fe44 100644
--- a/configure.in
+++ b/configure.in
@@ -113,11 +113,12 @@ X_EXTRA_LIBS=""

 PKG_CHECK_MODULES(libICE, ice >= 1.0
                  ,X_EXTRA_LIBS="${X_EXTRA_LIBS} -lICE"
-                 ,AC_MSG_ERROR([can't locate libICE]))
+                 ,AC_MSG_ERROR([can not locate libICE]))

 PKG_CHECK_MODULES(libSM, sm >= 1.0
                  ,X_EXTRA_LIBS="${X_EXTRA_LIBS} -lSM"
-                 ,AC_MSG_ERROR([can't locate libSM]))
+                 AC_DEFINE(HAVE_X11_SM_SMLIB_H, 1, [Have smlib])
+                 ,AC_MSG_ERROR([can not locate libSM]))

 X_SERVER="X.Org X11R7"

I'll commit that now.

@Teika: how far are your doc updates for sawfish 1.5? I would like to
release 1.5.1 this or the next week, as we got enough bugfixes in 1.6 to
backport :)

Thanks for your work Allin,
Chris

Am Dienstag, den 28.07.2009, 08:46 -0400 schrieb Allin Cottrell:
> On Tue, 28 Jul 2009, Christopher Roy Bratusek wrote:
> 
> > Hmm, I got an idea, what is causing the issue for gnome-session, now
> > there I think about:
> >
> > gnome-session has changed a lot in the 2.24 cycle, therefore also
> > sawfish session-desktop-file changed for gnome-session 2.24. Dunno, but
> > perhaps this new file -which works with gnome-session 2.24+- is not
> > working with 2.22? Can you try sawfish 1.5, with the .desktop files from
> > 1.3? If that is the issue, we will find a way to choose the right file
> > in 1.6.
> 
> I tried deleting all the sawfish*.desktop files installed by 1.5.0
> and reinstalling the sawfish.desktop from 1.3.5.1.  That didn't do
> it, but I've found the problem: it's in configure.in.  In the
> branch
> 
>  if test "$with_xorg_x11r7" != "no"; then ...
> 
> there's no test for X11/SM/SMlib.h.  So HAVE_X11_SM_SMLIB_H never
> gets defined, and therefore nothing useful happens in
> src/session.c.  The fix is a one-liner:
> 
> --- configure.in.orig	2009-07-28 08:37:14.000000000 -0400
> +++ configure.in	2009-07-28 08:32:06.000000000 -0400
> @@ -73,7 +73,7 @@
> 
>  if test "$with_xorg_x11r7" != "no"; then
> 
> -AC_CHECK_HEADERS(X11/extensions/Xdbe.h, [], [], [#include <X11/Xlib.h> ])
> +AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h, [], [], [#include <X11/Xlib.h> ])
> 
>  dnl Checks for X extensions/libraries
>  XINERAMA_LIBS=""
> 
> Allin Cottrell