Changeset 21371

Timestamp:

2009-12-16T19:05:08+13:00 (13 years ago)

Author:

ak19

Message:

ENABLE_JNI switch added in

Location:

main/trunk/gs2build

Files:

• configure (modified) (5 diffs)
• configure.in (modified) (1 diff)

main/trunk/gs2build/configure

@@ -310 +310 @@
 
 ac_subdirs_all="$ac_subdirs_all common-src build-src"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD USE_SQLITE ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD USE_SQLITE ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
 
@@ -859 +859 @@
   --disable-accentfold    Disable Accent Folding for MGPP
   --disable-sqlite        Disable SQLite support
+  --enable-jni    Enable JNI compilation
   --disable-mg    Disable MG compilation
   --disable-mgpp        Disable MGPP compilation
@@ -1370 +1371 @@
 if test "${with_micodir+set}" = set; then
   withval="$with_micodir"
-  MICO_DIR=$enableval
+  MICO_DIR=$withval
 else
   MICO_DIR="default"
@@ -1432 +1433 @@
 _ACEOF
 
+
+
+# Check whether --enable-jni or --disable-jni was given.
+if test "${enable_jni+set}" = set; then
+  enableval="$enable_jni"
+  ENABLE_JNI=$enableval
+else
+  ENABLE_JNI=no
+fi;
+if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then
+  ENABLE_JNI=1
+  cat >>confdefs.h <<\_ACEOF
+#define ENABLE_JNI
+_ACEOF
+
+else
+  ENABLE_JNI=0
+fi
 
 
@@ -7936 +7955 @@
 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
 s,@USE_SQLITE@,$USE_SQLITE,;t t
+s,@ENABLE_JNI@,$ENABLE_JNI,;t t
 s,@ENABLE_MG@,$ENABLE_MG,;t t
 s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t

main/trunk/gs2build/configure.in

@@ -72 +72 @@
 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
 AC_SUBST(USE_SQLITE)
+
+dnl
+dnl Set compilation of JNI parts of MG and MGPP indexers (disabled by default, which is GS2's default behaviour)
+dnl
+AC_ARG_ENABLE(jni, [  --enable-jni    Enable JNI compilation], ENABLE_JNI=$enableval, ENABLE_JNI=no)
+if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then
+  ENABLE_JNI=1
+  AC_DEFINE(ENABLE_JNI,[])
+else
+  ENABLE_JNI=0
+fi
+AC_SUBST(ENABLE_JNI)
 
 dnl