- Timestamp:
- 2009-12-16T14:09:53+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2/common-src/indexers
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/indexers/Makefile.in
r21328 r21364 61 61 62 62 63 all installclean:63 clean: 64 64 for odir in $(INDEXERDIRS); do \ 65 65 if test -d $$odir; then \ … … 67 67 (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 68 68 fi; \ 69 done 70 71 with-jni: 72 for odir in $(INDEXERDIRS); do \ 73 if test -d $$odir; then \ 74 echo making all in $$odir; \ 75 (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \ 76 fi; \ 77 done 78 79 install-with-jni: 80 for odir in $(INDEXERDIRS); do \ 81 if test -d $$odir; then \ 82 echo making install in $$odir; \ 83 (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \ 84 fi; \ 85 done 86 87 # make everything except jni stuff 88 without-jni: 89 for odir in $(UNAC) $(LUCENE); do \ 90 echo making $@ in $$odir; \ 91 (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \ 92 done 93 for odir in $(MG) $(MGPP); do \ 94 echo making $@ in $$odir; \ 95 (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \ 96 done 97 98 install-without-jni: 99 for odir in $(UNAC) $(LUCENE); do \ 100 echo making $@ in $$odir; \ 101 (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \ 102 done 103 for odir in $(MG) $(MGPP); do \ 104 echo making $@ in $$odir; \ 105 (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \ 69 106 done 70 107 … … 109 146 done 110 147 111 # make everything except jni stuff112 gs2:113 for odir in $(UNAC) $(LUCENE); do \114 echo making $@ in $$odir; \115 (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \116 done117 for odir in $(MG) $(MGPP); do \118 echo making $@ in $$odir; \119 (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \120 done121 122 install-gs2:123 for odir in $(UNAC) $(LUCENE); do \124 echo making $@ in $$odir; \125 (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \126 done127 for odir in $(MG) $(MGPP); do \128 echo making $@ in $$odir; \129 (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \130 done131 132 148 distclean: 133 149 for odir in $(INDEXERDIRS); do \ -
main/trunk/greenstone2/common-src/indexers/configure
r21328 r21364 275 275 ac_subdirs_all="$ac_subdirs_all mg" 276 276 ac_subdirs_all="$ac_subdirs_all mgpp" 277 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'277 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' 278 278 ac_subst_files='' 279 279 … … 787 787 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 788 788 --disable-accentfolding Disable Accent Folding support 789 --enable-jni Enable JNI compilation 789 790 --disable-mg Disable MG compilation 790 791 --disable-mgpp Disable MGPP compilation … … 1246 1247 1247 1248 1249 # Check whether --enable-jni or --disable-jni was given. 1250 if test "${enable_jni+set}" = set; then 1251 enableval="$enable_jni" 1252 ENABLE_JNI=$enableval 1253 else 1254 ENABLE_JNI=no 1255 fi; 1256 if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then 1257 ENABLE_JNI=1 1258 cat >>confdefs.h <<\_ACEOF 1259 #define ENABLE_JNI 1260 _ACEOF 1261 1262 else 1263 ENABLE_JNI=0 1264 fi 1265 1266 1267 1248 1268 # Check whether --enable-mg or --disable-mg was given. 1249 1269 if test "${enable_mg+set}" = set; then … … 1408 1428 CLASS_TEST=Test.class 1409 1429 cat << \EOF > $JAVA_TEST 1410 /* #line 14 10 "configure" */1430 /* #line 1430 "configure" */ 1411 1431 public class Test { 1412 1432 } … … 1578 1598 ac_cv_prog_uudecode_base64=yes 1579 1599 else 1580 echo "configure: 1 580: uudecode had trouble decoding base 64 file 'Test.uue'" >&51600 echo "configure: 1600: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 1581 1601 echo "configure: failed file was:" >&5 1582 1602 cat Test.uue >&5 … … 1696 1716 CLASS_TEST=Test.class 1697 1717 cat << \EOF > $JAVA_TEST 1698 /* #line 1 698 "configure" */1718 /* #line 1718 "configure" */ 1699 1719 public class Test { 1700 1720 } … … 1733 1753 TEST=Test 1734 1754 cat << \EOF > $JAVA_TEST 1735 /* [#]line 17 35 "configure" */1755 /* [#]line 1755 "configure" */ 1736 1756 public class Test { 1737 1757 public static void main (String args[]) { … … 2490 2510 s,@LIBS@,$LIBS,;t t 2491 2511 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 2512 s,@ENABLE_JNI@,$ENABLE_JNI,;t t 2492 2513 s,@ENABLE_MG@,$ENABLE_MG,;t t 2493 2514 s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t -
main/trunk/greenstone2/common-src/indexers/configure.ac
r21328 r21364 9 9 AC_DEFINE_UNQUOTED(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD) 10 10 AC_SUBST(ENABLE_ACCENTFOLD) 11 12 13 dnl 14 dnl Set compilation of JNI parts of MG and MGPP indexers (disabled by default, which is GS2's default behaviour) 15 dnl 16 AC_ARG_ENABLE(jni, [ --enable-jni Enable JNI compilation], ENABLE_JNI=$enableval, ENABLE_JNI=no) 17 if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then 18 ENABLE_JNI=1 19 AC_DEFINE(ENABLE_JNI,[]) 20 else 21 ENABLE_JNI=0 22 fi 23 AC_SUBST(ENABLE_JNI) 11 24 12 25 -
main/trunk/greenstone2/common-src/indexers/winMake.bat
r21328 r21364 45 45 if ""%2"" == ""javaonly"" goto java 46 46 if ""%2"" == ""nojava"" goto nojava 47 if ""%2"" == "" gs2"" goto gs247 if ""%2"" == ""without-jni"" goto without-jni 48 48 49 49 :all 50 :with-jni 50 51 if NOT EXIST "bin" mkdir bin 51 52 … … 87 88 for %%I in (lib srclib libcharset\lib) do if exist packages\windows\iconv\iconv\%%I\^*.obj del packages\windows\iconv\iconv\%%I\*.obj; 88 89 for %%I in (lib srclib libcharset\lib) do if exist packages\windows\iconv\iconv\%%I\^*.lib del packages\windows\iconv\iconv\%%I\*.lib; 90 goto done 89 91 90 92 :java … … 131 133 goto done 132 134 133 : gs2135 :without-jni 134 136 if NOT EXIST "bin" mkdir bin 135 137
Note:
See TracChangeset
for help on using the changeset viewer.