Changeset 21371

Show
Ignore:
Timestamp:
16.12.2009 19:05:08 (10 years ago)
Author:
ak19
Message:

ENABLE_JNI switch added in

Location:
main/trunk/gs2build
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2build/configure

    r21346 r21371  
    310310 
    311311ac_subdirs_all="$ac_subdirs_all common-src build-src" 
    312 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' 
     312ac_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' 
    313313ac_subst_files='' 
    314314 
     
    859859  --disable-accentfold    Disable Accent Folding for MGPP 
    860860  --disable-sqlite        Disable SQLite support 
     861  --enable-jni    Enable JNI compilation 
    861862  --disable-mg    Disable MG compilation 
    862863  --disable-mgpp        Disable MGPP compilation 
     
    13701371if test "${with_micodir+set}" = set; then 
    13711372  withval="$with_micodir" 
    1372   MICO_DIR=$enableval 
     1373  MICO_DIR=$withval 
    13731374else 
    13741375  MICO_DIR="default" 
     
    14321433_ACEOF 
    14331434 
     1435 
     1436 
     1437# Check whether --enable-jni or --disable-jni was given. 
     1438if test "${enable_jni+set}" = set; then 
     1439  enableval="$enable_jni" 
     1440  ENABLE_JNI=$enableval 
     1441else 
     1442  ENABLE_JNI=no 
     1443fi; 
     1444if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then 
     1445  ENABLE_JNI=1 
     1446  cat >>confdefs.h <<\_ACEOF 
     1447#define ENABLE_JNI 
     1448_ACEOF 
     1449 
     1450else 
     1451  ENABLE_JNI=0 
     1452fi 
    14341453 
    14351454 
     
    79367955s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 
    79377956s,@USE_SQLITE@,$USE_SQLITE,;t t 
     7957s,@ENABLE_JNI@,$ENABLE_JNI,;t t 
    79387958s,@ENABLE_MG@,$ENABLE_MG,;t t 
    79397959s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t 
  • main/trunk/gs2build/configure.in

    r21369 r21371  
    7272AC_DEFINE(USE_SQLITE, $USE_SQLITE) 
    7373AC_SUBST(USE_SQLITE) 
     74 
     75dnl 
     76dnl Set compilation of JNI parts of MG and MGPP indexers (disabled by default, which is GS2's default behaviour) 
     77dnl 
     78AC_ARG_ENABLE(jni, [  --enable-jni    Enable JNI compilation], ENABLE_JNI=$enableval, ENABLE_JNI=no) 
     79if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then 
     80  ENABLE_JNI=1 
     81  AC_DEFINE(ENABLE_JNI,[]) 
     82else 
     83  ENABLE_JNI=0 
     84fi 
     85AC_SUBST(ENABLE_JNI) 
    7486 
    7587dnl