Changeset 21329
- Timestamp:
- 2009-12-09T21:50:53+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2/runtime-src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/config.h.in
r16568 r21329 110 110 #undef USE_CORBA 111 111 112 /* Define ENABLE for indexers */ 113 #undef ENABLE_MG 114 #undef ENABLE_MGPP 115 #undef ENABLE_LUCENE 116 112 117 /* Define MICO_DIR if needsbe */ 113 118 #undef MICO_DIR -
main/trunk/greenstone2/runtime-src/configure
r20854 r21329 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 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 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 … … 860 860 --disable-sqlite Disable SQLite support 861 861 --enable-apache-httpd Enable Apache httpd support 862 --disable-mg Disable MG compilation 863 --disable-mgpp Disable MGPP compilation 864 --disable-lucene Disable Lucene compilation 862 865 863 866 Optional Packages: … … 1447 1450 1448 1451 1452 # Check whether --enable-mg or --disable-mg was given. 1453 if test "${enable_mg+set}" = set; then 1454 enableval="$enable_mg" 1455 ENABLE_MG=$enableval 1456 else 1457 ENABLE_MG=yes 1458 fi; 1459 if test $ENABLE_MG = "yes" -o $ENABLE_MG = "1" ; then 1460 ENABLE_MG=1 1461 cat >>confdefs.h <<\_ACEOF 1462 #define ENABLE_MG 1463 _ACEOF 1464 1465 else 1466 ENABLE_MG=0 1467 fi 1468 1469 1470 # Check whether --enable-mgpp or --disable-mgpp was given. 1471 if test "${enable_mgpp+set}" = set; then 1472 enableval="$enable_mgpp" 1473 ENABLE_MGPP=$enableval 1474 else 1475 ENABLE_MGPP=yes 1476 fi; 1477 if test $ENABLE_MGPP = "yes" -o $ENABLE_MGPP = "1" ; then 1478 ENABLE_MGPP=1 1479 cat >>confdefs.h <<\_ACEOF 1480 #define ENABLE_MGPP 1481 _ACEOF 1482 1483 else 1484 ENABLE_MGPP=0 1485 fi 1486 1487 1488 # Check whether --enable-lucene or --disable-lucene was given. 1489 if test "${enable_lucene+set}" = set; then 1490 enableval="$enable_lucene" 1491 ENABLE_LUCENE=$enableval 1492 else 1493 ENABLE_LUCENE=yes 1494 fi; 1495 if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then 1496 ENABLE_LUCENE=1 1497 cat >>confdefs.h <<\_ACEOF 1498 #define ENABLE_LUCENE 1499 _ACEOF 1500 1501 else 1502 ENABLE_LUCENE=0 1503 fi 1504 1449 1505 1450 1506 LDFLAGS=$LDFLAGS … … 7843 7899 s,@USE_SQLITE@,$USE_SQLITE,;t t 7844 7900 s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t 7901 s,@ENABLE_MG@,$ENABLE_MG,;t t 7902 s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t 7903 s,@ENABLE_LUCENE@,$ENABLE_LUCENE,;t t 7845 7904 s,@LDFLAGS@,$LDFLAGS,;t t 7846 7905 s,@CFLAGS@,$CFLAGS,;t t -
main/trunk/greenstone2/runtime-src/configure.in
r20853 r21329 82 82 AC_SUBST(USE_APACHE_HTTPD) 83 83 84 dnl 85 dnl Set compilation of MG (enabled by default) 86 dnl 87 AC_ARG_ENABLE(mg, [ --disable-mg Disable MG compilation], ENABLE_MG=$enableval, ENABLE_MG=yes) 88 if test $ENABLE_MG = "yes" -o $ENABLE_MG = "1" ; then 89 ENABLE_MG=1 90 AC_DEFINE(ENABLE_MG,[]) 91 else 92 ENABLE_MG=0 93 fi 94 AC_SUBST(ENABLE_MG) 95 96 dnl 97 dnl Set compilation of MGPP (enabled by default) 98 dnl 99 AC_ARG_ENABLE(mgpp, [ --disable-mgpp Disable MGPP compilation], ENABLE_MGPP=$enableval, ENABLE_MGPP=yes) 100 if test $ENABLE_MGPP = "yes" -o $ENABLE_MGPP = "1" ; then 101 ENABLE_MGPP=1 102 AC_DEFINE(ENABLE_MGPP,[]) 103 else 104 ENABLE_MGPP=0 105 fi 106 AC_SUBST(ENABLE_MGPP) 107 108 dnl 109 dnl Set compilation of lucene (enabled by default) 110 dnl 111 AC_ARG_ENABLE(lucene, [ --disable-lucene Disable Lucene compilation], ENABLE_LUCENE=$enableval, ENABLE_LUCENE=yes) 112 if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then 113 ENABLE_LUCENE=1 114 AC_DEFINE(ENABLE_LUCENE,[]) 115 else 116 ENABLE_LUCENE=0 117 fi 118 AC_SUBST(ENABLE_LUCENE) 84 119 85 120 dnl Checks for programs. -
main/trunk/greenstone2/runtime-src/win32.mak
r20430 r21329 37 37 USE_MSSQL = 0 38 38 USE_Z3950 = 0 39 ENABLE_MG = 1 40 ENABLE_MGPP = 1 41 ENABLE_LUCENE = 1 39 42 40 43 MDEFINES = /f win32.mak … … 69 72 MAKECMD = $(MAKECMD) DLLDEBUG=1 70 73 !ENDIF 71 !IF $(USE_SQLITE)74 !IF "$(USE_SQLITE)" == "" 72 75 MAKECMD = $(MAKECMD) USE_SQLITE=1 76 !ELSE 77 MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE) 73 78 !ENDIF 74 79 !IF $(USE_MSSQL) … … 79 84 INSTALLDIRS = src\z3950 $(INSTALLDIRS) 80 85 PACKAGEDIRS = $(PACKAGEDIRS) packages\d2m $(YAZ_DIR) 86 !ENDIF 87 !IF "$(ENABLE_MG)" == "" 88 MAKECMD = $(MAKECMD) ENABLE_MG=1 89 !ELSE 90 MAKECMD = $(MAKECMD) ENABLE_MG=$(ENABLE_MG) 91 !ENDIF 92 !IF "$(ENABLE_MGPP)" == "" 93 MAKECMD = $(MAKECMD) ENABLE_MGPP=1 94 !ELSE 95 MAKECMD = $(MAKECMD) ENABLE_MGPP=$(ENABLE_MGPP) 96 !ENDIF 97 !IF "$(ENABLE_LUCENE)" == "" 98 MAKECMD = $(MAKECMD) ENABLE_LUCENE=1 99 !ELSE 100 MAKECMD = $(MAKECMD) ENABLE_LUCENE=$(ENABLE_LUCENE) 81 101 !ENDIF 82 102
Note:
See TracChangeset
for help on using the changeset viewer.