[Kexi] koffice/kexi

[Sebastian Sauer]

SVN commit 485872 by sebsauer:

Removed --enable-kexi-scripting option. Kexi uses --enable-scripting direct now.
Use ./configure --enable-scripting --enable-kexi-scripting-gui to compile kexi with scripting and the scriptingeditor plugin enabled.

CCMAIL:kexi at kde.org



 M  +1 -1      Makefile.am  
 M  +0 -5      configure.in.in  
 M  +1 -1      core/Makefile.am  


--- trunk/koffice/kexi/Makefile.am #485871:485872
@@ -7,7 +7,7 @@
 kexi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO)
 kexi_la_LIBADD = ./core/libkexicore.la ./main/libkeximain.la
 
-if compile_kross_plugin
+if compile_kross
   SCRIPTINGSUBDIR=scripting
 endif
 
--- trunk/koffice/kexi/configure.in.in #485871:485872
@@ -3,8 +3,3 @@
 AC_SUBST(LIB_KEXI_KMDI, '-lkmdi')
 AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '')
 
-AC_ARG_ENABLE(kexi-scripting,
-    AC_HELP_STRING([--enable-kexi-scripting],
-                   [build Kexi scripting module (based on KROSS, requires '--enable-scripting') (EXPERIMENTAL) [default=no]]),
-    compile_kross_plugin=$enableval, compile_kross_plugin=no)
-AM_CONDITIONAL(compile_kross_plugin, test "x$compile_kross_plugin" != "xno")
--- trunk/koffice/kexi/core/Makefile.am #485871:485872
@@ -17,7 +17,7 @@
 
 #kexipartdatasource.cpp
 
-if compile_kross_plugin
+if compile_kross
   KROSSDEFINES=-DKEXI_KROSS_SUPPORT
   KROSSINCLUDE=-I$(top_srcdir)/lib/kross
   KROSSLIB=$(top_builddir)/lib/kross/main/libkrossmain.la