Bug 89387 - [PATCH] kscreensaver configure fix for GL
Summary: [PATCH] kscreensaver configure fix for GL
Status: RESOLVED FIXED
Alias: None
Product: kscreensaver
Classification: Miscellaneous
Component: general (show other bugs)
Version: unspecified
Platform: Compiled Sources Linux
: NOR normal
Target Milestone: ---
Assignee: kscreensaver bugs tracking
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-09-13 00:58 UTC by Gregorio Guidi
Modified: 2008-05-19 17:59 UTC (History)
0 users

See Also:
Latest Commit:
Version Fixed In:


Attachments
gl-kdesavers.diff (994 bytes, patch)
2004-09-13 01:02 UTC, Gregorio Guidi
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Gregorio Guidi 2004-09-13 00:58:49 UTC
Version:            (using KDE Devel)
Installed from:    Compiled sources

if kdeartwork is configured with --without-gl,
the GL screensavers in kscreensaver/xsavers are not compiled. But if the configure scripts detects that Qt is compiled with GL support, it tries to compile the GL screensavers in kscreensaver/kdesavers, but since the macro for setting GL include paths and stuff was not executed, the compilation fails.

The following one-liner disables compilation of GL screensavers in both kdesavers and xsavers with --without-gl.

RCS file: /home/kde/kdeartwork/kscreensaver/configure.in.in,v
retrieving revision 1.12
diff -u -3 -b -r1.12 configure.in.in
--- configure.in.in     10 Mar 2004 16:22:48 -0000      1.12
+++ configure.in.in     12 Sep 2004 22:50:32 -0000
@@ -32,7 +32,7 @@
 AC_HAVE_GL( have_gl=yes, have_gl=no )

 AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
-AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes)
+AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes)
 AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)

 LIBART=
Comment 1 Gregorio Guidi 2004-09-13 01:02:10 UTC
Created attachment 7499 [details]
gl-kdesavers.diff
Comment 2 Chris Howells 2004-11-15 23:01:34 UTC
Thanks for your patch. A fix for this was committed recently.
Comment 3 Gregorio Guidi 2005-01-11 22:41:34 UTC
What was the fix?

I can still reproduce this one with current CVS...
Comment 4 Gregorio Guidi 2005-02-09 15:03:34 UTC
confirming the bug is still there.
Comment 5 Chris Howells 2005-06-11 23:31:59 UTC
SVN commit 424438 by howells:

Fix the GL checks. Thanks a lot for the patch and apologies for the delay, real life took over :(

CCBUG: 89387



 M  +1 -1      configure.in.in  


--- trunk/KDE/kdeartwork/kscreensaver/configure.in.in #424437:424438
@@ -32,7 +32,7 @@
 AC_HAVE_GL( have_gl=yes, have_gl=no )
 
 AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
-AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes)
+AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes) 
 AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
 AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
 
Comment 6 Chris Howells 2005-06-11 23:32:47 UTC
SVN commit 424439 by howells:

Backport fix to 3.4 branch

CCBUG: 89387


 M  +1 -1      configure.in.in  


--- branches/KDE/3.4/kdeartwork/kscreensaver/configure.in.in #424438:424439
@@ -32,7 +32,7 @@
 AC_HAVE_GL( have_gl=yes, have_gl=no )
 
 AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
-AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes)
+AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes) 
 AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
 AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
 
Comment 7 Chris Howells 2005-06-11 23:33:42 UTC
Fixed.