Changeset 21330 for main/trunk/greenstone2
- Timestamp:
- 2009-12-09T21:51:41+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/config.h.in
r10856 r21330 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/configure
r20853 r21330 310 310 311 311 ac_subdirs_all="$ac_subdirs_all common-src build-src runtime-src" 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: … … 1369 1372 if test "${with_micodir+set}" = set; then 1370 1373 withval="$with_micodir" 1371 MICO_DIR=$ enableval1374 MICO_DIR=$withval 1372 1375 else 1373 1376 MICO_DIR="default" … … 1444 1447 _ACEOF 1445 1448 1449 1450 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 1471 # Check whether --enable-mgpp or --disable-mgpp was given. 1472 if test "${enable_mgpp+set}" = set; then 1473 enableval="$enable_mgpp" 1474 ENABLE_MGPP=$enableval 1475 else 1476 ENABLE_MGPP=yes 1477 fi; 1478 if test $ENABLE_MGPP = "yes" -o $ENABLE_MGPP = "1" ; then 1479 ENABLE_MGPP=1 1480 cat >>confdefs.h <<\_ACEOF 1481 #define ENABLE_MGPP 1482 _ACEOF 1483 1484 else 1485 ENABLE_MGPP=0 1486 fi 1487 1488 1489 # Check whether --enable-lucene or --disable-lucene was given. 1490 if test "${enable_lucene+set}" = set; then 1491 enableval="$enable_lucene" 1492 ENABLE_LUCENE=$enableval 1493 else 1494 ENABLE_LUCENE=yes 1495 fi; 1496 if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then 1497 ENABLE_LUCENE=1 1498 cat >>confdefs.h <<\_ACEOF 1499 #define ENABLE_LUCENE 1500 _ACEOF 1501 1502 else 1503 ENABLE_LUCENE=0 1504 fi 1446 1505 1447 1506 … … 7861 7920 s,@USE_SQLITE@,$USE_SQLITE,;t t 7862 7921 s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t 7922 s,@ENABLE_MG@,$ENABLE_MG,;t t 7923 s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t 7924 s,@ENABLE_LUCENE@,$ENABLE_LUCENE,;t t 7863 7925 s,@LDFLAGS@,$LDFLAGS,;t t 7864 7926 s,@CFLAGS@,$CFLAGS,;t t -
main/trunk/greenstone2/configure.in
r20853 r21330 38 38 AC_SUBST(USE_CORBA) 39 39 40 AC_ARG_WITH(micodir, [ --with-micodir Use installed MICO directory], MICO_DIR=$ enableval, MICO_DIR="default")40 AC_ARG_WITH(micodir, [ --with-micodir Use installed MICO directory], MICO_DIR=$withval, MICO_DIR="default") 41 41 AC_DEFINE_UNQUOTED(MICO_DIR, "$MICO_DIR") 42 42 AC_SUBST(MICO_DIR) … … 80 80 AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD) 81 81 AC_SUBST(USE_APACHE_HTTPD) 82 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 97 dnl 98 dnl Set compilation of MGPP (enabled by default) 99 dnl 100 AC_ARG_ENABLE(mgpp, [ --disable-mgpp Disable MGPP compilation], ENABLE_MGPP=$enableval, ENABLE_MGPP=yes) 101 if test $ENABLE_MGPP = "yes" -o $ENABLE_MGPP = "1" ; then 102 ENABLE_MGPP=1 103 AC_DEFINE(ENABLE_MGPP,[]) 104 else 105 ENABLE_MGPP=0 106 fi 107 AC_SUBST(ENABLE_MGPP) 108 109 dnl 110 dnl Set compilation of lucene (enabled by default) 111 dnl 112 AC_ARG_ENABLE(lucene, [ --disable-lucene Disable Lucene compilation], ENABLE_LUCENE=$enableval, ENABLE_LUCENE=yes) 113 if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then 114 ENABLE_LUCENE=1 115 AC_DEFINE(ENABLE_LUCENE, []) 116 else 117 ENABLE_LUCENE=0 118 fi 119 AC_SUBST(ENABLE_LUCENE) 82 120 83 121 -
main/trunk/greenstone2/win32.mak
r19522 r21330 36 36 USE_Z3950 = 0 37 37 38 # by default, all indexers are enabled 39 ENABLE_MG = 1 40 ENABLE_MGPP = 1 41 ENABLE_LUCENE = 1 42 43 38 44 MDEFINES = /f win32.mak 39 45 … … 61 67 MAKECMD = $(MAKECMD) DLLDEBUG=1 62 68 !ENDIF 63 !IF $(USE_SQLITE)69 !IF "$(USE_SQLITE)" == "" 64 70 MAKECMD = $(MAKECMD) USE_SQLITE=1 71 !ELSE 72 MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE) 65 73 !ENDIF 66 74 !IF $(USE_MSSQL) … … 69 77 !IF $(USE_Z3950) 70 78 MAKECMD = $(MAKECMD) USE_Z3950=1 79 !ENDIF 80 !IF "$(ENABLE_MG)" == "" 81 MAKECMD = $(MAKECMD) ENABLE_MG=1 82 !ELSE 83 MAKECMD = $(MAKECMD) ENABLE_MG=$(ENABLE_MG) 84 !ENDIF 85 !IF "$(ENABLE_MGPP)" == "" 86 MAKECMD = $(MAKECMD) ENABLE_MGPP=1 87 !ELSE 88 MAKECMD = $(MAKECMD) ENABLE_MGPP=$(ENABLE_MGPP) 89 !ENDIF 90 !IF "$(ENABLE_LUCENE)" == "" 91 MAKECMD = $(MAKECMD) ENABLE_LUCENE=1 92 !ELSE 93 MAKECMD = $(MAKECMD) ENABLE_LUCENE=$(ENABLE_LUCENE) 71 94 !ENDIF 72 95
Note:
See TracChangeset
for help on using the changeset viewer.