[Kst] kdeextragear-2/kst

[Andrew Walker]

CVS commit by arwalker: 

KCalendarSystem obsolete


  M +0 -43     configure.in.in   1.45
  M +3 -6      kst/Makefile.am   1.177


--- kdeextragear-2/kst/kst/Makefile.am  #1.176:1.177
@@ -9,12 +9,9 @@
 KMDI_SUBDIR=libkstkmdi
 endif
-if include_libkstkcalendarsystem
-KCALENDARSYSTEM_SUBDIR=libkstkcalendarsystem
-endif
 if include_linux
 PROCPS_COPY=sysinfo.c psversion.c
 endif
 
-SUBDIRS=$(KMDI_SUBDIR) $(KCALENDARSYSTEM_SUBDIR) . datasources extensions
+SUBDIRS=$(KMDI_SUBDIR) . datasources extensions
 
 bin_PROGRAMS = kst d2asc
@@ -186,5 +183,5 @@
 include_HEADERS = kstdatasource.h kstobject.h kst_export.h
 
-kst_LDADD = $(LIB_KDEPRINT) $(LIB_KCALENDARSYSTEM) libkstplot.la libkstmath.la libkst.la libkstguiapp.la
+kst_LDADD = $(LIB_KDEPRINT) libkstplot.la libkstmath.la libkst.la libkstguiapp.la
 kst_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
@@ -211,5 +208,5 @@
 
 # set the include path for X, qt and KDE
-INCLUDES= $(KMDI_INCLUDES) $(KCALENDARSYSTEM_INCLUDES) -I$(top_srcdir) $(all_includes)
+INCLUDES= $(KMDI_INCLUDES) -I$(top_srcdir) $(all_includes)
 
 rcdir = $(kde_datadir)/kst

--- kdeextragear-2/kst/configure.in.in  #1.44:1.45
@@ -154,47 +154,4 @@
 KST_CHECK_MDI
 
-AC_DEFUN([KST_CHECK_CALENDARSYSTEM],
-[
-  AC_MSG_CHECKING(whether to use kcalendarsystem lib from kdelibs)
-  AC_CACHE_VAL(ac_cv_calendarsystem_setup,
-  [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$KDE_INCLUDES $QT_INCLUDES"
-
-    AC_TRY_LINK([
-      #include <kdeversion.h>
-    ],
-    [
-      #if KDE_VERSION < ((3<<16) | (2<<8) | (0))
-         KDE_choke me
-      #endif
-    ],
-      ac_cv_calendarsystem_setup=yes,
-      ac_cv_calendarsystem_setup=no
-    )
-    CXXFLAGS="$save_CXXFLAGS"
-    AC_LANG_RESTORE
-   ])
-
-  AM_CONDITIONAL(include_libkstkcalendarsystem, test "$ac_cv_calendarsystem_setup" = "no")
-  if test "$ac_cv_calendarsystem_setup" = "yes"; then
-    LIB_KCALENDARSYSTEM=""
-    KCALENDARSYSTEM_INCLUDES=""
-    AC_MSG_RESULT(yes)
-  else
-    LIB_KCALENDARSYSTEM='$(top_builddir)/kst/kst/libkstkcalendarsystem/libkstkcalendarsystem.la'
-    KCALENDARSYSTEM_INCLUDES='-I$(top_srcdir)/kst/kst/libkstkcalendarsystem'
-    CXXFLAGS="$CXXFLAGS -DCOMPAT_KCALENDARSYSTEM"
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_SUBST(LIB_KCALENDARSYSTEM)
-  AC_SUBST(KCALENDARSYSTEM_INCLUDES)
-])
-
-KST_CHECK_CALENDARSYSTEM
-
 AC_DEFUN([KST_CHECK_JSE],
 [