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

List:       kde-commits
Subject:    koffice/kexi
From:       Martin Ellis <kde () martinellis ! co ! uk>
Date:       2005-04-24 18:35:42
Message-ID: 20050424183542.DE5F1630 () office ! kde ! org
[Download RAW message or body]

CVS commit by martin: 

Configure option for compiling in scripting support:  --enable-scripting
Right now, it's disabled by default.

Probably still need to set KEXI_OPTIONS for this to work:
http://www.kexi-project.org/wiki/wikiview/index.php?AdvancedBuildNotes


  M +5 -1      Makefile.am   1.102
  M +11 -6     plugins/scripting/Makefile.am   1.12
  M +5 -0      scripting/configure.in.in   1.2


--- koffice/kexi/Makefile.am  #1.101:1.102
@@ -9,6 +9,10 @@
         ./main/libkeximain.la
 
+if compile_kross_plugin
+  SCRIPTING=scripting
+endif
+
 SUBDIRS= 3rdparty kexidb core widget formeditor \
-data pics main migration plugins . tests
+data pics main migration $(SCRIPTING) plugins . tests
 
 #(will be reenabled after main/startup move)  

--- koffice/kexi/plugins/scripting/Makefile.am  #1.11:1.12
@@ -3,4 +3,12 @@
 kde_module_LTLIBRARIES = kexihandler_script.la
 
+if compile_kross_plugin
+KROSS_DEFINES=-DKEXI_KROSS_SUPPORT 
+KROSS_INCLUDE=-I$(top_srcdir)/kexi/scripting
+KROSS_LIB=$(top_builddir)/kexi/scripting/main/libkrossmain.la
+endif
+
+AM_CPPFLAGS=$(KROSS_DEFINES)
+
 kexihandler_script_la_SOURCES = \
     kexiscriptpart.cpp kexiscriptview.cpp kexiscripteditor.cpp
@@ -11,9 +19,6 @@
 kexihandler_script_la_LIBADD = \
     $(top_builddir)/kexi/core/libkexicore.la \
-    $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-
-# to test kross uncomment following lines
-#kexihandler_script_la_LIBADD += $(top_builddir)/kexi/scripting/main/libkrossmain.la
-#DEFINES = -DKEXI_KROSS_SUPPORT
+    $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+    $(KROSS_LIB)
 
 INCLUDES = \
@@ -21,5 +26,5 @@
     -I$(top_srcdir)/kexi \
     -I$(top_srcdir)/kexi/widget \
-    -I$(top_srcdir)/kexi/scripting \
+    $(KROSS_INCLUDE) \
     $(all_includes)
 

--- koffice/kexi/scripting/configure.in.in  #1.1:1.2
@@ -28,2 +28,7 @@
 AC_SUBST(PYTHON_FLAGS)
 
+AC_ARG_ENABLE(scripting,
+    AC_HELP_STRING([--enable-scripting],
+                   [build Kross scripting support [default=no]]),
+    compile_kross_plugin=$enableval, compile_kross_plugin=no)
+AM_CONDITIONAL(compile_kross_plugin, test "x$compile_kross_plugin" != "xno")


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