[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

use our own kjsembed if scripting is requested and the KDE install is too old


  M +5 -4      configure.in.in   1.52
  M +14 -0     kst/extensions/js/Makefile.am   1.23
  M +0 -1      kst/extensions/js/TODO   1.11
  M +2 -22     kst/extensions/js/kjsembed/Makefile.am   1.5


--- kdeextragear-2/kst/configure.in.in  #1.51:1.52
@@ -218,5 +218,5 @@
 AC_DEFUN([KST_CHECK_JSE],
 [
-  AC_MSG_CHECKING(whether to compile the Kst JS extension)
+  AC_MSG_CHECKING(whether to use our own KJSEmbed)
   AC_CACHE_VAL(ac_cv_kjs_setup,
   [
@@ -246,7 +246,7 @@
 
   if test "$ac_cv_kjs_setup" = "yes"; then
-    AC_MSG_RESULT(yes)
-  else
     AC_MSG_RESULT(no)
+  else
+    AC_MSG_RESULT(yes)
   fi
 ])
@@ -256,5 +256,6 @@
     [KST_CHECK_JSE]
     )
-AM_CONDITIONAL(include_kjse, test "$ac_cv_kjs_setup" = "yes")
+AM_CONDITIONAL(include_kjse, test "x$ac_cv_kjs_setup" = "xyes" -o "x$ac_cv_kjs_setup" = "xno")
+AM_CONDITIONAL(include_kjse_internal, test "x$ac_cv_kjs_setup" = "xno")
 
 KDE_CHECK_HEADER(linux/vt.h, AC_DEFINE(HAVE_LINUX, 1, [If we have a Linux platform]) have_linux=yes, , )

--- kdeextragear-2/kst/kst/extensions/js/Makefile.am  #1.22:1.23
@@ -1,3 +1,13 @@
+if include_kjse_internal
+    KJSEMBED_SUBDIR=kjsembed
+endif
+
+SUBDIRS=$(KJSEMBED_SUBDIR) .
+
+if include_kjse_internal
+INCLUDES=-I$(srcdir)/../.. -I$(srcdir)/kjsembed $(all_includes)
+else
 INCLUDES=-I$(srcdir)/../.. $(all_includes)
+endif
 
 kde_module_LTLIBRARIES=kstextension_js.la
@@ -9,5 +19,9 @@
 
 kstextension_js_la_LDFLAGS=$(all_libraries) -module -avoid-version
+if include_kjse_internal
+kstextension_js_la_LIBADD=../../libkstapp.la kjsembed/libkjsembed.la
+else
 kstextension_js_la_LIBADD=../../libkstapp.la -lkjsembed
+endif
 kstextension_js_la_SOURCES= \
                             js.cpp \

--- kdeextragear-2/kst/kst/extensions/js/TODO  #1.10:1.11
@@ -1,4 +1,3 @@
 Major:
-- link in our own kjsembed if needed (and rename it)
 - more verbose error messages (ie: which argument is wrong, and why)
 - what should we do for toString()?  It's basically empty in all classes

--- kdeextragear-2/kst/kst/extensions/js/kjsembed/Makefile.am  #1.4:1.5
@@ -7,8 +7,7 @@
 INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
 
-SUBDIRS = bindings builtins qtbindings . plugin plugins stdlib
+SUBDIRS = bindings builtins qtbindings .
 
-lib_LTLIBRARIES = libkjsembed.la
-bin_PROGRAMS    = kjscmd
+noinst_LTLIBRARIES = libkjsembed.la
 
 libkjsembed_la_METASOURCES = AUTO
@@ -78,21 +77,2 @@
                         $(LIB_KHTML) -lkjs $(LIBSOCKET)
 
-kjscmd_SOURCES =        kjscmd.cpp
-kjscmd_LDFLAGS =        $(all_libraries) $(KDE_RPATH)
-kjscmd_LDADD =          libkjsembed.la
-
-man_MANS =              kjscmd.1
-
-xdg_apps_DATA =  kjscmd.desktop
-
-plugintypedir = $(kde_servicetypesdir)
-plugintype_DATA = binding_type.desktop
-
-srcdoc:
-        $(kde_bindir)/kdoc -a -p -d classdocs -n 'KJSEmbed' *.h -lqt -lkdecore -lkdeui
-
-tidytildes:
-        rm -f *~
-
-
-