Show
Ignore:
Timestamp:
06.05.2010 21:23:54 (10 years ago)
Author:
ak19
Message:

Changes to makefiles to 1. incorporate USE_GDBM and USE_JDBM flags (and USE_SQLITE) in most places so that the DEFINES variable is set at all times. This is necessary to ensure that all classes that contain objects with gdbm and jdbm members are of a consistent size. Else we've had experience with Greenstone crashing with memory errors (to do with the similar ENABLE_indexer flags). 2. ENABLE_JDBM is now USE_JDBM. 3. Not everything works now. It still compiles the default way, but the disable-gdbm flag is causing trouble when compiling argdb in recpt since it uses that.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/configure.in

    r21446 r22058  
    7171AC_SUBST(USE_YAZ) 
    7272 
     73dnl 
     74dnl Set use of JDBM (enabled by default) 
     75dnl 
     76AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes) 
     77if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 
     78  USE_JDBM=1 
     79  AC_DEFINE(USE_JDBM,[]) 
     80else 
     81  USE_JDBM=0 
     82fi 
     83AC_SUBST(USE_JDBM) 
     84 
     85dnl 
     86dnl Set use of GDBM (enabled by default) 
     87dnl 
     88AC_ARG_ENABLE(gdbm, [  --disable-gdbm        Disable GDBM compilation], USE_GDBM=$enableval, USE_GDBM=yes) 
     89if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 
     90  USE_GDBM=1 
     91  AC_DEFINE(USE_GDBM,[]) 
     92else 
     93  USE_GDBM=0 
     94fi 
     95AC_SUBST(USE_GDBM) 
     96 
    7397dnl  
    7498dnl disable compilation of accent folding stuff for mgpp (and one day mg) 
     
    82106fi 
    83107AC_SUBST(ENABLE_ACCENTFOLD) 
    84  
    85 dnl 
    86 dnl Set use of JDBM (enabled by default) 
    87 dnl 
    88 AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM compilation], ENABLE_JDBM=$enableval, ENABLE_JDBM=yes) 
    89 if test $ENABLE_JDBM = "yes" -o $ENABLE_JDBM = "1" ; then 
    90   ENABLE_JDBM=1 
    91   AC_DEFINE(ENABLE_JDBM,[]) 
    92 else 
    93   ENABLE_JDBM=0 
    94 fi 
    95 AC_SUBST(ENABLE_JDBM) 
    96108 
    97109dnl