Changeset 21364 for main/trunk/greenstone2/common-src/indexers/configure

Timestamp:

2009-12-16T14:09:53+13:00 (14 years ago)

Author:

ak19

Message:

New configuration and compilation flag ENABLE_JNI added which will be disabled by default for GS2 since in general GS doesn't need mg and mgpp compiled up with jni. GS3

File:

• main/trunk/greenstone2/common-src/indexers/configure (modified) (8 diffs)

main/trunk/greenstone2/common-src/indexers/configure

@@ -275 +275 @@
 ac_subdirs_all="$ac_subdirs_all mg"
 ac_subdirs_all="$ac_subdirs_all mgpp"
-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 ENABLE_ACCENTFOLD ENABLE_MG ENABLE_MGPP ENABLE_LUCENE COMPAT32BITFLAGS JAVAC JAVA uudecode subdirs LIBOBJS 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 ENABLE_ACCENTFOLD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE COMPAT32BITFLAGS JAVAC JAVA uudecode subdirs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -787 +787 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-accentfolding    Disable Accent Folding support
+  --enable-jni    Enable JNI compilation
   --disable-mg        Disable MG compilation
   --disable-mgpp        Disable MGPP compilation
@@ -1246 +1247 @@
 
 
+# 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
+
+
+
 # Check whether --enable-mg or --disable-mg was given.
 if test "${enable_mg+set}" = set; then
@@ -1408 +1428 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 1410 "configure" */
+/* #line 1430 "configure" */
 public class Test {
 }
@@ -1578 +1598 @@
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 1580: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 1600: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
@@ -1696 +1716 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 1698 "configure" */
+/* #line 1718 "configure" */
 public class Test {
 }
@@ -1733 +1753 @@
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 1735 "configure" */
+/* [#]line 1755 "configure" */
 public class Test {
 public static void main (String args[]) {
@@ -2490 +2510 @@
 s,@LIBS@,$LIBS,;t t
 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
+s,@ENABLE_JNI@,$ENABLE_JNI,;t t
 s,@ENABLE_MG@,$ENABLE_MG,;t t
 s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t