Changeset 21409

Show
Ignore:
Timestamp:
04.01.2010 23:08:33 (9 years ago)
Author:
davidb
Message:

Introduction of --enable-jdbm flag

Location:
main/trunk/greenstone2
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/configure

    r21365 r21409  
    312312ac_subdirs_all="$ac_subdirs_all packages" 
    313313ac_subdirs_all="$ac_subdirs_all indexers" 
    314 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' 
     314ac_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_JDBM 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' 
    315315ac_subst_files='' 
    316316 
     
    860860  --disable-yaz           Disable YAZ compilation 
    861861  --disable-accentfold    Disable Accent Folding for MGPP 
     862  --disable-jdbm        Disable JDBM support 
    862863  --disable-sqlite        Disable SQLite support 
    863864  --enable-jni    Enable JNI compilation 
     
    14271428 
    14281429 
     1430# Check whether --enable-jdbm or --disable-jdbm was given. 
     1431if test "${enable_jdbm+set}" = set; then 
     1432  enableval="$enable_jdbm" 
     1433  USE_JDBM=0 
     1434else 
     1435  USE_JDBM=1 
     1436fi; 
     1437cat >>confdefs.h <<\_ACEOF 
     1438#define USE_JDBM $USE_JDBM 
     1439_ACEOF 
     1440 
     1441 
     1442 
    14291443# Check whether --enable-sqlite or --disable-sqlite was given. 
    14301444if test "${enable_sqlite+set}" = set; then 
     
    79037917s,@USE_YAZ@,$USE_YAZ,;t t 
    79047918s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 
     7919s,@USE_JDBM@,$USE_JDBM,;t t 
    79057920s,@USE_SQLITE@,$USE_SQLITE,;t t 
    79067921s,@ENABLE_JNI@,$ENABLE_JNI,;t t 
  • main/trunk/greenstone2/common-src/configure.in

    r21365 r21409  
    6868AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD) 
    6969AC_SUBST(ENABLE_ACCENTFOLD) 
     70 
     71dnl 
     72dnl Set use of JDBM (enabled by default) 
     73dnl 
     74AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM support], USE_JDBM=0, USE_JDBM=1) 
     75AC_DEFINE(USE_JDBM, $USE_JDBM) 
     76AC_SUBST(USE_JDBM) 
    7077 
    7178dnl 
  • main/trunk/greenstone2/common-src/packages/Makefile.in

    r20832 r21409  
    2626 
    2727 
     28USE_JDBM=@USE_JDBM@ 
     29 
     30ifeq ($(USE_JDBM), 1) 
     31JDBM_DIR = jdbm/jdbm-1.0 
     32else 
     33JDBM_DIR =  
     34endif 
     35 
    2836USE_SQLITE=@USE_SQLITE@ 
    2937 
     
    3947# CLEANDIRS is COMPILEDIRS and iconv and expat. Iconv and expat get compiled 
    4048# up during the configure stage itself. 
    41 COMPILEDIRS =   gdbm $(SQLITE_DIR) search4j 
     49COMPILEDIRS =   gdbm $(SQLITE_DIR) $(JDBM_DIR) search4j 
    4250CLEANDIRS = iconv expat $(COMPILEDIRS) 
    4351 
     
    4856          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    4957        done 
     58ifeq ($(USE_JDBM), 1) 
     59# do 'make install' in jdbm directory to get the jar file into the right place 
     60    cd $(JDBM_DIR) && $(MAKE) $(MDEFINES) install 
     61endif 
    5062ifeq ($(USE_SQLITE), 1) 
    5163# need to do make install in sqlite to get the header files and library into the right place 
  • main/trunk/greenstone2/common-src/packages/configure

    r20832 r21409  
    181181 
    182182 
     183# configure JDBM 
     184echo "" 
     185echo "Configuring JDBM" 
     186if test x$USE_JDBM = xtrue ;  
     187then 
     188  echo "" 
     189  cd "$PACKAGES/jdbm" 
     190  if test ! -d jdbm-1.0 ; 
     191  then 
     192    gzip -dc gs-jdbm-1.0.tar.gz | tar -xf - 
     193  fi 
     194else 
     195  echo "JDBM support disabled." 
     196  echo "  add '--enable-jdbm' to the configure command to include JDBM support." 
     197  echo "" 
     198fi 
     199 
    183200# configure SQLite 
    184201echo "" 
     
    189206  cd "$PACKAGES/sqlite" 
    190207  if test ! -d sqlite-amalgamation-3.5.9 ; 
    191   then 
     208  then  
    192209    gzip -dc sqlite-amalgamation-3.5.9.tar.gz | tar -xf - 
    193210  fi 
  • main/trunk/greenstone2/configure

    r21377 r21409  
    312312ac_subdirs_all="$ac_subdirs_all build-src" 
    313313ac_subdirs_all="$ac_subdirs_all runtime-src" 
    314 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_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' 
     314ac_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_JDBM 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' 
    315315ac_subst_files='' 
    316316 
     
    860860  --disable-yaz           Disable YAZ compilation 
    861861  --disable-accentfold    Disable Accent Folding for MGPP 
     862  --disable-jdbm        Disable JDBM support 
    862863  --disable-sqlite        Disable SQLite support 
    863864  --enable-apache-httpd  Enable Apache httpd support 
     
    14261427 
    14271428 
     1429# Check whether --enable-jdbm or --disable-jdbm was given. 
     1430if test "${enable_jdbm+set}" = set; then 
     1431  enableval="$enable_jdbm" 
     1432  USE_JDBM=0 
     1433else 
     1434  USE_JDBM=1 
     1435fi; 
     1436cat >>confdefs.h <<\_ACEOF 
     1437#define USE_JDBM $USE_JDBM 
     1438_ACEOF 
     1439 
     1440 
     1441 
    14281442# Check whether --enable-sqlite or --disable-sqlite was given. 
    14291443if test "${enable_sqlite+set}" = set; then 
     
    79527966s,@USE_YAZ@,$USE_YAZ,;t t 
    79537967s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 
     7968s,@USE_JDBM@,$USE_JDBM,;t t 
    79547969s,@USE_SQLITE@,$USE_SQLITE,;t t 
    79557970s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t 
  • main/trunk/greenstone2/configure.in

    r21377 r21409  
    6666AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD) 
    6767AC_SUBST(ENABLE_ACCENTFOLD) 
     68 
     69dnl 
     70dnl Set use of JDBM (enabled by default) 
     71dnl 
     72AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM support], USE_JDBM=0, USE_JDBM=1) 
     73AC_DEFINE(USE_JDBM, $USE_JDBM) 
     74AC_SUBST(USE_JDBM) 
    6875 
    6976dnl