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

List:       kde-commits
Subject:    kdeartwork/kscreensaver
From:       Caleb Tennis <caleb () aei-tech ! com>
Date:       2004-08-13 13:19:50
Message-ID: 20040813131950.561019A13 () office ! kde ! org
[Download RAW message or body]

CVS commit by ctennis: 

Add a conditional for kfiresaver to allow --without-arts to work again.


  M +1 -0      configure.in.in   1.13
  M +8 -3      kdesavers/Makefile.am   1.42


--- kdeartwork/kscreensaver/configure.in.in  #1.12:1.13
@@ -35,4 +35,5 @@
 AM_CONDITIONAL(COMPILE_GL_KSAVERS, 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$have_arts = \
xyes)  
 LIBART=

--- kdeartwork/kscreensaver/kdesavers/Makefile.am  #1.41:1.42
@@ -22,7 +22,12 @@
 LIBART_KSAVERS_LDADD = $(AM_LDADD) $(LIBART_LIBS)
 
+if COMPILE_ARTS_KSAVERS
+ARTS_KSAVERS = kfiresaver.kss
+ARTS_DESKTOP_FILES = KFiresaver.desktop
+endif
+
 if COMPILE_GL_KSAVERS
-GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss \
                ksolarwinds.kss krotation.kss kpendulum.kss kfiresaver.kss
-GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop \
KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop \
KFiresaver.desktop +GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss \
keuphoria.kss ksolarwinds.kss krotation.kss kpendulum.kss $(ARTS_KSAVERS) \
+GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop \
KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop \
$(ARTS_DESKTOP_FILES)  endif
 GL_KSAVERS_LDADD = $(AM_LDADD) $(GLLIB)


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