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/runtime-src/configure

    r21440 r22058  
    310310 
    311311ac_subdirs_all="$ac_subdirs_all packages" 
    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 USE_JDBM USE_GDBM 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' 
    313313ac_subst_files='' 
    314314 
     
    857857  --enable-z3950          Enable Z39.50 client support 
    858858  --disable-yaz           Disable YAZ compilation 
     859  --disable-jdbm        Disable JDBM compilation 
     860  --disable-gdbm        Disable GDBM compilation 
    859861  --disable-accentfold    Disable Accent Folding for MGPP 
    860862  --disable-sqlite        Disable SQLite support 
     
    13591361if test "${enable_corba+set}" = set; then 
    13601362  enableval="$enable_corba" 
     1363  USE_CORBA=$enableval 
     1364else 
     1365  USE_CORBA=no 
     1366fi; 
     1367if test $USE_CORBA = "yes" -o $USE_CORBA = "1" ; then 
    13611368  USE_CORBA=1 
     1369  cat >>confdefs.h <<\_ACEOF 
     1370#define USE_CORBA 
     1371_ACEOF 
     1372 
    13621373else 
    13631374  USE_CORBA=0 
    1364 fi; 
    1365 cat >>confdefs.h <<_ACEOF 
    1366 #define USE_CORBA $USE_CORBA 
    1367 _ACEOF 
    1368  
     1375fi 
    13691376 
    13701377 
     
    13861393if test "${enable_z3950+set}" = set; then 
    13871394  enableval="$enable_z3950" 
     1395  USE_Z3950=$enableval 
     1396else 
     1397  USE_Z3950=no 
     1398fi; 
     1399if test $USE_Z3950 = "yes" -o $USE_Z3950 = "1" ; then 
    13881400  USE_Z3950=1 
     1401  cat >>confdefs.h <<\_ACEOF 
     1402#define USE_Z3950 
     1403_ACEOF 
     1404 
    13891405else 
    13901406  USE_Z3950=0 
    1391 fi; 
    1392 if test USE_Z3950 = 1; then 
    1393 cat >>confdefs.h <<\_ACEOF 
    1394 #define USE_Z3950 $USE_Z3950 
    1395 _ACEOF 
    1396  
    1397  
    1398 fi 
     1407fi 
     1408 
    13991409 
    14001410# Check whether --enable-yaz or --disable-yaz was given. 
    14011411if test "${enable_yaz+set}" = set; then 
    14021412  enableval="$enable_yaz" 
     1413  USE_YAZ=$enableval 
     1414else 
     1415  USE_YAZ=yes 
     1416fi; 
     1417if test $USE_YAZ = "yes" -o $USE_YAZ = "1" ; then 
     1418  USE_YAZ=1 
     1419  cat >>confdefs.h <<\_ACEOF 
     1420#define USE_YAZ 
     1421_ACEOF 
     1422 
     1423else 
    14031424  USE_YAZ=0 
    1404 else 
    1405   USE_YAZ=1 
     1425fi 
     1426 
     1427 
     1428# Check whether --enable-jdbm or --disable-jdbm was given. 
     1429if test "${enable_jdbm+set}" = set; then 
     1430  enableval="$enable_jdbm" 
     1431  USE_JDBM=$enableval 
     1432else 
     1433  USE_JDBM=yes 
    14061434fi; 
    1407 cat >>confdefs.h <<\_ACEOF 
    1408 #define USE_YAZ $USE_YAZ 
    1409 _ACEOF 
    1410  
     1435if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 
     1436  USE_JDBM=1 
     1437  cat >>confdefs.h <<\_ACEOF 
     1438#define USE_JDBM 
     1439_ACEOF 
     1440 
     1441else 
     1442  USE_JDBM=0 
     1443fi 
     1444 
     1445 
     1446# Check whether --enable-gdbm or --disable-gdbm was given. 
     1447if test "${enable_gdbm+set}" = set; then 
     1448  enableval="$enable_gdbm" 
     1449  USE_GDBM=$enableval 
     1450else 
     1451  USE_GDBM=yes 
     1452fi; 
     1453if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 
     1454  USE_GDBM=1 
     1455  cat >>confdefs.h <<\_ACEOF 
     1456#define USE_GDBM 
     1457_ACEOF 
     1458 
     1459else 
     1460  USE_GDBM=0 
     1461fi 
    14111462 
    14121463 
     
    14141465if test "${enable_accentfold+set}" = set; then 
    14151466  enableval="$enable_accentfold" 
     1467  ENABLE_ACCENTFOLD=$enableval 
     1468else 
     1469  ENABLE_ACCENTFOLD=yes 
     1470fi; 
     1471if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then 
     1472  ENABLE_ACCENTFOLD=1 
     1473  cat >>confdefs.h <<\_ACEOF 
     1474#define ENABLE_ACCENTFOLD 
     1475_ACEOF 
     1476 
     1477else 
    14161478  ENABLE_ACCENTFOLD=0 
    1417 else 
    1418   ENABLE_ACCENTFOLD=1 
    1419 fi; 
    1420 cat >>confdefs.h <<\_ACEOF 
    1421 #define ENABLE_ACCENTFOLD $ENABLE_ACCENTFOLD 
    1422 _ACEOF 
    1423  
     1479fi 
    14241480 
    14251481 
     
    14271483if test "${enable_sqlite+set}" = set; then 
    14281484  enableval="$enable_sqlite" 
     1485  USE_SQLITE=$enableval 
     1486else 
     1487  USE_SQLITE=yes 
     1488fi; 
     1489if test $USE_SQLITE = "yes" -o $USE_SQLITE = "1" ; then 
     1490  USE_SQLITE=1 
     1491  cat >>confdefs.h <<\_ACEOF 
     1492#define USE_SQLITE 
     1493_ACEOF 
     1494 
     1495else 
    14291496  USE_SQLITE=0 
    1430 else 
    1431   USE_SQLITE=1 
    1432 fi; 
    1433 cat >>confdefs.h <<\_ACEOF 
    1434 #define USE_SQLITE $USE_SQLITE 
    1435 _ACEOF 
    1436  
    1437  
    1438  
    1439 # Check whether --enable-apache-httpd or --disable-apache-httpd was given. 
     1497fi 
     1498 
     1499 
     1500if test -d runtime-src; then 
     1501   # Check whether --enable-apache-httpd or --disable-apache-httpd was given. 
    14401502if test "${enable_apache_httpd+set}" = set; then 
    14411503  enableval="$enable_apache_httpd" 
    1442   USE_APACHE_HTTPD=1 
    1443 else 
    1444   USE_APACHE_HTTPD=0 
     1504  USE_APACHE_HTTPD=$enableval 
     1505else 
     1506  USE_APACHE_HTTPD=no 
    14451507fi; 
    1446 cat >>confdefs.h <<\_ACEOF 
    1447 #define USE_APACHE_HTTPD $USE_APACHE_HTTPD 
    1448 _ACEOF 
    1449  
    1450  
     1508   if test $USE_APACHE_HTTPD = "yes" -o $USE_APACHE_HTTPD = "1" ; then 
     1509     USE_APACHE_HTTPD=1 
     1510     cat >>confdefs.h <<\_ACEOF 
     1511#define USE_APACHE_HTTPD 
     1512_ACEOF 
     1513 
     1514   else 
     1515     USE_APACHE_HTTPD=0 
     1516   fi 
     1517 
     1518fi 
    14511519 
    14521520# Check whether --enable-mg or --disable-mg was given. 
     
    79067974s,@USE_Z3950@,$USE_Z3950,;t t 
    79077975s,@USE_YAZ@,$USE_YAZ,;t t 
     7976s,@USE_JDBM@,$USE_JDBM,;t t 
     7977s,@USE_GDBM@,$USE_GDBM,;t t 
    79087978s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 
    79097979s,@USE_SQLITE@,$USE_SQLITE,;t t