Changeset 22058 for main/trunk/greenstone2/runtime-src
- Timestamp:
- 2010-05-06T21:23:54+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2/runtime-src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/configure
r21440 r22058 310 310 311 311 ac_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'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 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' 313 313 ac_subst_files='' 314 314 … … 857 857 --enable-z3950 Enable Z39.50 client support 858 858 --disable-yaz Disable YAZ compilation 859 --disable-jdbm Disable JDBM compilation 860 --disable-gdbm Disable GDBM compilation 859 861 --disable-accentfold Disable Accent Folding for MGPP 860 862 --disable-sqlite Disable SQLite support … … 1359 1361 if test "${enable_corba+set}" = set; then 1360 1362 enableval="$enable_corba" 1363 USE_CORBA=$enableval 1364 else 1365 USE_CORBA=no 1366 fi; 1367 if test $USE_CORBA = "yes" -o $USE_CORBA = "1" ; then 1361 1368 USE_CORBA=1 1369 cat >>confdefs.h <<\_ACEOF 1370 #define USE_CORBA 1371 _ACEOF 1372 1362 1373 else 1363 1374 USE_CORBA=0 1364 fi; 1365 cat >>confdefs.h <<_ACEOF 1366 #define USE_CORBA $USE_CORBA 1367 _ACEOF 1368 1375 fi 1369 1376 1370 1377 … … 1386 1393 if test "${enable_z3950+set}" = set; then 1387 1394 enableval="$enable_z3950" 1395 USE_Z3950=$enableval 1396 else 1397 USE_Z3950=no 1398 fi; 1399 if test $USE_Z3950 = "yes" -o $USE_Z3950 = "1" ; then 1388 1400 USE_Z3950=1 1401 cat >>confdefs.h <<\_ACEOF 1402 #define USE_Z3950 1403 _ACEOF 1404 1389 1405 else 1390 1406 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 1407 fi 1408 1399 1409 1400 1410 # Check whether --enable-yaz or --disable-yaz was given. 1401 1411 if test "${enable_yaz+set}" = set; then 1402 1412 enableval="$enable_yaz" 1413 USE_YAZ=$enableval 1414 else 1415 USE_YAZ=yes 1416 fi; 1417 if 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 1423 else 1403 1424 USE_YAZ=0 1404 else 1405 USE_YAZ=1 1425 fi 1426 1427 1428 # Check whether --enable-jdbm or --disable-jdbm was given. 1429 if test "${enable_jdbm+set}" = set; then 1430 enableval="$enable_jdbm" 1431 USE_JDBM=$enableval 1432 else 1433 USE_JDBM=yes 1406 1434 fi; 1407 cat >>confdefs.h <<\_ACEOF 1408 #define USE_YAZ $USE_YAZ 1409 _ACEOF 1410 1435 if 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 1441 else 1442 USE_JDBM=0 1443 fi 1444 1445 1446 # Check whether --enable-gdbm or --disable-gdbm was given. 1447 if test "${enable_gdbm+set}" = set; then 1448 enableval="$enable_gdbm" 1449 USE_GDBM=$enableval 1450 else 1451 USE_GDBM=yes 1452 fi; 1453 if 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 1459 else 1460 USE_GDBM=0 1461 fi 1411 1462 1412 1463 … … 1414 1465 if test "${enable_accentfold+set}" = set; then 1415 1466 enableval="$enable_accentfold" 1467 ENABLE_ACCENTFOLD=$enableval 1468 else 1469 ENABLE_ACCENTFOLD=yes 1470 fi; 1471 if 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 1477 else 1416 1478 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 1479 fi 1424 1480 1425 1481 … … 1427 1483 if test "${enable_sqlite+set}" = set; then 1428 1484 enableval="$enable_sqlite" 1485 USE_SQLITE=$enableval 1486 else 1487 USE_SQLITE=yes 1488 fi; 1489 if 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 1495 else 1429 1496 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. 1497 fi 1498 1499 1500 if test -d runtime-src; then 1501 # Check whether --enable-apache-httpd or --disable-apache-httpd was given. 1440 1502 if test "${enable_apache_httpd+set}" = set; then 1441 1503 enableval="$enable_apache_httpd" 1442 USE_APACHE_HTTPD= 11443 else 1444 USE_APACHE_HTTPD= 01504 USE_APACHE_HTTPD=$enableval 1505 else 1506 USE_APACHE_HTTPD=no 1445 1507 fi; 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 1518 fi 1451 1519 1452 1520 # Check whether --enable-mg or --disable-mg was given. … … 7906 7974 s,@USE_Z3950@,$USE_Z3950,;t t 7907 7975 s,@USE_YAZ@,$USE_YAZ,;t t 7976 s,@USE_JDBM@,$USE_JDBM,;t t 7977 s,@USE_GDBM@,$USE_GDBM,;t t 7908 7978 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 7909 7979 s,@USE_SQLITE@,$USE_SQLITE,;t t -
main/trunk/greenstone2/runtime-src/configure.in
r21446 r22058 71 71 fi 72 72 AC_SUBST(USE_YAZ) 73 74 dnl 75 dnl Set use of JDBM (enabled by default) 76 dnl 77 AC_ARG_ENABLE(jdbm, [ --disable-jdbm Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes) 78 if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 79 USE_JDBM=1 80 AC_DEFINE(USE_JDBM,[]) 81 else 82 USE_JDBM=0 83 fi 84 AC_SUBST(USE_JDBM) 85 86 dnl 87 dnl Set use of GDBM (enabled by default) 88 dnl 89 AC_ARG_ENABLE(gdbm, [ --disable-gdbm Disable GDBM compilation], USE_GDBM=$enableval, USE_GDBM=yes) 90 if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 91 USE_GDBM=1 92 AC_DEFINE(USE_GDBM,[]) 93 else 94 USE_GDBM=0 95 fi 96 AC_SUBST(USE_GDBM) 73 97 74 98 dnl -
main/trunk/greenstone2/runtime-src/packages/configure
r20850 r22058 22 22 ENVIRONMENT="" 23 23 24 # GDBM compilation enabled by default, can switch it off with --disable-gdbm 25 USE_GDBM=true 26 # JDBM compilation enabled by default, can switch it off with --disable-jdbm 27 USE_JDBM=true 24 28 # SQLite support enabled by default, can switch it off with --disable-sqlite 25 29 USE_SQLITE=true … … 50 54 CACHE_FILE="--cache-file=$cache_file" 51 55 fi 56 ;; 57 --disable-gdbm) 58 USE_GDBM=false 59 ;; 60 --disable-jdbm) 61 USE_JDBM=false 52 62 ;; 53 63 --disable-sqlite) -
main/trunk/greenstone2/runtime-src/src/colservr/Makefile.in
r22050 r22058 81 81 82 82 83 # Currently not configurable, and always on 84 USE_GDBM = 1 83 USE_GDBM = @USE_GDBM@ 85 84 ifeq ($(USE_GDBM), 1) 86 85 GDBM_DEFINES = -DUSE_GDBM … … 92 91 93 92 94 # Currently not configurable, and always on 95 USE_JDBM = 1 93 USE_JDBM = @USE_JDBM@ 96 94 ifeq ($(USE_JDBM), 1) 97 95 JDBM_DEFINES = -DUSE_JDBM -
main/trunk/greenstone2/runtime-src/src/corba/Makefile.in
r21442 r22058 63 63 endif 64 64 65 USE_GDBM = @USE_GDBM@ 66 ifeq ($(USE_GDBM), 1) 67 GDBM_DEFINES = -DUSE_GDBM 68 else 69 GDBM_DEFINES = 70 endif 71 72 USE_JDBM = @USE_JDBM@ 73 ifeq ($(USE_JDBM), 1) 74 JDBM_DEFINES = -DUSE_JDBM 75 else 76 JDBM_DEFINES = 77 endif 65 78 66 79 USE_SQLITE = @USE_SQLITE@ 67 80 ifeq ($(USE_SQLITE), 1) 68 81 SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread 82 SQLITE_DEFINES = -DUSE_SQLITE 69 83 else 70 84 SQLITE_LIBS = 85 SQLITE_DEFINES = 71 86 endif 72 87 … … 86 101 CC = @CC@ 87 102 CFLAGS = @CFLAGS@ 88 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 103 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 89 104 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES) \ 90 105 $(MICO_INCLUDES) -
main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in
r21324 r22058 62 62 endif 63 63 64 USE_GDBM = @USE_GDBM@ 65 ifeq ($(USE_GDBM), 1) 66 GDBM_DEFINES = -DUSE_GDBM 67 else 68 GDBM_DEFINES = 69 endif 70 71 USE_JDBM = @USE_JDBM@ 72 ifeq ($(USE_JDBM), 1) 73 JDBM_DEFINES = -DUSE_JDBM 74 else 75 JDBM_DEFINES = 76 endif 64 77 65 78 USE_SQLITE = @USE_SQLITE@ 66 79 ifeq ($(USE_SQLITE), 1) 80 SQLITE_DEFINES = -DUSE_SQLITE 67 81 SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread 68 82 else 69 83 SQLITE_LIBS = 84 SQLITE_DEFINES = 70 85 endif 71 86 … … 75 90 CXX = @CXX@ 76 91 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 92 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 77 93 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES) 78 94 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ … … 82 98 83 99 84 CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $( INCLUDES)100 CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 85 101 CXXLINK = $(CXX) $(LDFLAGS) -o $@ 86 102 -
main/trunk/greenstone2/runtime-src/src/protocol/Makefile.in
r21324 r22058 40 40 endif 41 41 42 USE_GDBM = @USE_GDBM@ 43 ifeq ($(USE_GDBM), 1) 44 GDBM_DEFINES = -DUSE_GDBM 45 else 46 GDBM_DEFINES = 47 endif 48 49 USE_JDBM = @USE_JDBM@ 50 ifeq ($(USE_JDBM), 1) 51 JDBM_DEFINES = -DUSE_JDBM 52 else 53 JDBM_DEFINES = 54 endif 55 56 USE_SQLITE = @USE_SQLITE@ 57 ifeq ($(USE_SQLITE), 1) 58 SQLITE_DEFINES = -DUSE_SQLITE 59 else 60 SQLITE_DEFINES = 61 endif 62 63 42 64 AR = ar 43 65 CXX = @CXX@ 44 66 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 45 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 67 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 46 68 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 47 69 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \ -
main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in
r22046 r22058 81 81 endif 82 82 83 # Currently not configurable, and always on 84 USE_GDBM = 1 83 USE_GDBM = @USE_GDBM@ 85 84 ifeq ($(USE_GDBM), 1) 86 85 GDBM_DEFINES = -DUSE_GDBM … … 89 88 GDBM_DEFINES = 90 89 GDBM_INCLUDES = 90 endif 91 92 USE_JDBM = @USE_JDBM@ 93 ifeq ($(USE_JDBM), 1) 94 JDBM_DEFINES = -DUSE_JDBM 95 else 96 JDBM_DEFINES = 91 97 endif 92 98 … … 95 101 SQLITE_DEFINES = -DUSE_SQLITE 96 102 SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread 103 SQL_SOURCES = sqlqueryaction.cpp 104 SQL_OBJECTS = sqlqueryaction.o 97 105 else 98 106 SQLITE_DEFINES = 99 107 SQLITE_LIBS = 100 endif101 102 ifeq ($(USE_SQLITE), 1)103 SQL_SOURCES = sqlqueryaction.cpp104 SQL_OBJECTS = sqlqueryaction.o105 else106 108 SQL_SOURCES = 107 109 SQL_OBJECTS = … … 146 148 CXX = @CXX@ 147 149 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 148 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(GDBM_DEFINES) $( SQLITE_DEFINES) $(Z3950_DEFS)150 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS) 149 151 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ 150 152 -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ -
main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in
r21361 r22058 62 62 endif 63 63 64 USE_GDBM = @USE_GDBM@ 65 ifeq ($(USE_GDBM), 1) 66 GDBM_DEFINES = -DUSE_GDBM 67 else 68 GDBM_DEFINES = 69 endif 70 71 USE_JDBM = @USE_JDBM@ 72 ifeq ($(USE_JDBM), 1) 73 JDBM_DEFINES = -DUSE_JDBM 74 else 75 JDBM_DEFINES = 76 endif 64 77 65 78 USE_SQLITE = @USE_SQLITE@ 66 79 ifeq ($(USE_SQLITE), 1) 67 80 SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread 81 SQLITE_DEFINES = -DUSE_SQLITE 68 82 else 69 83 SQLITE_LIBS = 84 SQLITE_DEFINES = 70 85 endif 71 86 … … 77 92 CFLAGS = @CFLAGS@ 78 93 CPPFLAGS = @CXXFLAGS@ 79 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 94 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 80 95 GSDLOS = @gsdlos@ 81 96 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
Note:
See TracChangeset
for help on using the changeset viewer.