Show
Ignore:
Timestamp:
16.12.2009 14:11:07 (10 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's build.xml will need to explicitly set ENABLE_JNI to compile mg and mgpp with jni.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/configure

    r21330 r21366  
    310310 
    311311ac_subdirs_all="$ac_subdirs_all common-src build-src runtime-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 USE_APACHE_HTTPD 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 USE_APACHE_HTTPD 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 
     
    860860  --disable-sqlite        Disable SQLite support 
    861861  --enable-apache-httpd  Enable Apache httpd support 
     862  --enable-jni    Enable JNI compilation 
    862863  --disable-mg    Disable MG compilation 
    863864  --disable-mgpp        Disable MGPP compilation 
     
    14491450 
    14501451 
     1452# Check whether --enable-jni or --disable-jni was given. 
     1453if test "${enable_jni+set}" = set; then 
     1454  enableval="$enable_jni" 
     1455  ENABLE_JNI=$enableval 
     1456else 
     1457  ENABLE_JNI=no 
     1458fi; 
     1459if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then 
     1460  ENABLE_JNI=1 
     1461  cat >>confdefs.h <<\_ACEOF 
     1462#define ENABLE_JNI 
     1463_ACEOF 
     1464 
     1465else 
     1466  ENABLE_JNI=0 
     1467fi 
     1468 
    14511469 
    14521470# Check whether --enable-mg or --disable-mg was given. 
     
    79207938s,@USE_SQLITE@,$USE_SQLITE,;t t 
    79217939s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t 
     7940s,@ENABLE_JNI@,$ENABLE_JNI,;t t 
    79227941s,@ENABLE_MG@,$ENABLE_MG,;t t 
    79237942s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t