[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

unsermake compilation patch from Waldo


  M +1 -3      configure.in.in   1.21
  M +0 -1      devel-docs/newviewtodo.txt   1.6
  M +4 -0      kst/Makefile.am   1.100
  M +1 -1      tests/planck/Makefile.am   1.3


--- kdeextragear-2/kst/configure.in.in  #1.20:1.21
@@ -74,13 +74,12 @@
    ])
 
+  AM_CONDITIONAL(include_libkstkmdi, test "$ac_cv_mdi_setup" = "no")
   if test "$ac_cv_mdi_setup" = "yes"; then
     LIB_KMDI="-lkmdi"
     KMDI_INCLUDES=""
-    KMDI_SUBDIR=""
     AC_MSG_RESULT(yes)
   else
     LIB_KMDI='$(top_builddir)/kst/kst/libkstkmdi/libkstkmdi.la'
     KMDI_INCLUDES='-I$(top_srcdir)/kst/kst/libkstkmdi'
-    KMDI_SUBDIR="libkstkmdi"
     CXXFLAGS="$CXXFLAGS -DCOMPAT_KMDI"
     AC_MSG_RESULT(no)
@@ -88,5 +87,4 @@
 
   AC_SUBST(LIB_KMDI)
-  AC_SUBST(KMDI_SUBDIR)
   AC_SUBST(KMDI_INCLUDES)
 ])

--- kdeextragear-2/kst/devel-docs/newviewtodo.txt  #1.5:1.6
@@ -4,5 +4,4 @@
 - Factories need to register earlier and automatically for each view object type
 - Rename plots that cause namespace conflicts
-- Drag enter where source() == this is buggy.
 - DCOP ID needs to be stored for callback
 - Callback for objects that we need

--- kdeextragear-2/kst/kst/Makefile.am  #1.99:1.100
@@ -3,4 +3,8 @@
 AM_LFLAGS = 
 
+if include_libkstkmdi
+KMDI_SUBDIR=libkstkmdi
+endif
+
 SUBDIRS=$(KMDI_SUBDIR) . datasources 
 # extensions  FIXME: re-enable when working again

--- kdeextragear-2/kst/tests/planck/Makefile.am  #1.2:1.3
@@ -3,5 +3,5 @@
 INCLUDES=$(all_includes)
 toigen_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-toigen_LDADD = $(KST_LIBS) -lm
+toigen_LDADD = $(PIOLIBS) -lm
 toigen_SOURCES = toigen.c