Ignore:
Timestamp:
2010-05-06T21:23:54+12:00 (14 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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/common-src/configure

    r21440 r22058  
    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 ENABLE_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'
     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 USE_JDBM USE_GDBM 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'
    315315ac_subst_files=''
    316316
    … …  
    859859  --enable-z3950          Enable Z39.50 client support
    860860  --disable-yaz           Disable YAZ compilation
     861  --disable-jdbm        Disable JDBM compilation
     862  --disable-gdbm        Disable GDBM compilation
    861863  --disable-accentfold    Disable Accent Folding for MGPP
    862   --disable-jdbm        Disable JDBM compilation
    863864  --disable-sqlite        Disable SQLite support
    864865  --enable-jni    Enable JNI compilation
    … …  
    13631364if test "${enable_corba+set}" = set; then
    13641365  enableval="$enable_corba"
     1366  USE_CORBA=$enableval
     1367else
     1368  USE_CORBA=no
     1369fi;
     1370if test $USE_CORBA = "yes" -o $USE_CORBA = "1" ; then
    13651371  USE_CORBA=1
     1372  cat >>confdefs.h <<\_ACEOF
     1373#define USE_CORBA
     1374_ACEOF
     1375
    13661376else
    13671377  USE_CORBA=0
    1368 fi;
    1369 cat >>confdefs.h <<_ACEOF
    1370 #define USE_CORBA $USE_CORBA
    1371 _ACEOF
    1372 
     1378fi
    13731379
    13741380
    … …  
    13901396if test "${enable_z3950+set}" = set; then
    13911397  enableval="$enable_z3950"
     1398  USE_Z3950=$enableval
     1399else
     1400  USE_Z3950=no
     1401fi;
     1402if test $USE_Z3950 = "yes" -o $USE_Z3950 = "1" ; then
    13921403  USE_Z3950=1
     1404  cat >>confdefs.h <<\_ACEOF
     1405#define USE_Z3950
     1406_ACEOF
     1407
    13931408else
    13941409  USE_Z3950=0
    1395 fi;
    1396 if test USE_Z3950 = 1; then
    1397 cat >>confdefs.h <<\_ACEOF
    1398 #define USE_Z3950 $USE_Z3950
    1399 _ACEOF
    1400 
    1401 
    1402 fi
     1410fi
     1411
    14031412
    14041413# Check whether --enable-yaz or --disable-yaz was given.
    14051414if test "${enable_yaz+set}" = set; then
    14061415  enableval="$enable_yaz"
     1416  USE_YAZ=$enableval
     1417else
     1418  USE_YAZ=yes
     1419fi;
     1420if test $USE_YAZ = "yes" -o $USE_YAZ = "1" ; then
     1421  USE_YAZ=1
     1422  cat >>confdefs.h <<\_ACEOF
     1423#define USE_YAZ
     1424_ACEOF
     1425
     1426else
    14071427  USE_YAZ=0
    1408 else
    1409   USE_YAZ=1
     1428fi
     1429
     1430
     1431# Check whether --enable-jdbm or --disable-jdbm was given.
     1432if test "${enable_jdbm+set}" = set; then
     1433  enableval="$enable_jdbm"
     1434  USE_JDBM=$enableval
     1435else
     1436  USE_JDBM=yes
    14101437fi;
    1411 cat >>confdefs.h <<\_ACEOF
    1412 #define USE_YAZ $USE_YAZ
    1413 _ACEOF
    1414 
     1438if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then
     1439  USE_JDBM=1
     1440  cat >>confdefs.h <<\_ACEOF
     1441#define USE_JDBM
     1442_ACEOF
     1443
     1444else
     1445  USE_JDBM=0
     1446fi
     1447
     1448
     1449# Check whether --enable-gdbm or --disable-gdbm was given.
     1450if test "${enable_gdbm+set}" = set; then
     1451  enableval="$enable_gdbm"
     1452  USE_GDBM=$enableval
     1453else
     1454  USE_GDBM=yes
     1455fi;
     1456if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then
     1457  USE_GDBM=1
     1458  cat >>confdefs.h <<\_ACEOF
     1459#define USE_GDBM
     1460_ACEOF
     1461
     1462else
     1463  USE_GDBM=0
     1464fi
    14151465
    14161466
    … …  
    14181468if test "${enable_accentfold+set}" = set; then
    14191469  enableval="$enable_accentfold"
     1470  ENABLE_ACCENTFOLD=$enableval
     1471else
     1472  ENABLE_ACCENTFOLD=yes
     1473fi;
     1474if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then
     1475  ENABLE_ACCENTFOLD=1
     1476  cat >>confdefs.h <<\_ACEOF
     1477#define ENABLE_ACCENTFOLD
     1478_ACEOF
     1479
     1480else
    14201481  ENABLE_ACCENTFOLD=0
    1421 else
    1422   ENABLE_ACCENTFOLD=1
    1423 fi;
    1424 cat >>confdefs.h <<\_ACEOF
    1425 #define ENABLE_ACCENTFOLD $ENABLE_ACCENTFOLD
    1426 _ACEOF
    1427 
    1428 
    1429 
    1430 # Check whether --enable-jdbm or --disable-jdbm was given.
    1431 if test "${enable_jdbm+set}" = set; then
    1432   enableval="$enable_jdbm"
    1433   ENABLE_JDBM=$enableval
    1434 else
    1435   ENABLE_JDBM=yes
    1436 fi;
    1437 if test $ENABLE_JDBM = "yes" -o $ENABLE_JDBM = "1" ; then
    1438   ENABLE_JDBM=1
    1439   cat >>confdefs.h <<\_ACEOF
    1440 #define ENABLE_JDBM
    1441 _ACEOF
    1442 
    1443 else
    1444   ENABLE_JDBM=0
    1445 fi
     1482fi
     1483
    14461484
    14471485
    … …  
    14491487if test "${enable_sqlite+set}" = set; then
    14501488  enableval="$enable_sqlite"
     1489  USE_SQLITE=$enableval
     1490else
     1491  USE_SQLITE=yes
     1492fi;
     1493if test $USE_SQLITE = "yes" -o $USE_SQLITE = "1" ; then
     1494  USE_SQLITE=1
     1495  cat >>confdefs.h <<\_ACEOF
     1496#define USE_SQLITE
     1497_ACEOF
     1498
     1499else
    14511500  USE_SQLITE=0
    1452 else
    1453   USE_SQLITE=1
    1454 fi;
    1455 cat >>confdefs.h <<\_ACEOF
    1456 #define USE_SQLITE $USE_SQLITE
    1457 _ACEOF
    1458 
     1501fi
    14591502
    14601503
    … …  
    79317974s,@USE_Z3950@,$USE_Z3950,;t t
    79327975s,@USE_YAZ@,$USE_YAZ,;t t
     7976s,@USE_JDBM@,$USE_JDBM,;t t
     7977s,@USE_GDBM@,$USE_GDBM,;t t
    79337978s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
    7934 s,@ENABLE_JDBM@,$ENABLE_JDBM,;t t
    79357979s,@USE_SQLITE@,$USE_SQLITE,;t t
    79367980s,@ENABLE_JNI@,$ENABLE_JNI,;t t
Note: See TracChangeset for help on using the changeset viewer.