Changeset 21330

Show
Ignore:
Timestamp:
09.12.2009 21:51:41 (10 years ago)
Author:
ak19
Message:

Changes to makefiles, configure files, and source code to work with the new configure flags that allow indexers to be individually compiled up by setting each indexer to be enabled or disabled (enable-mg, enable-mgpp, enable-lucene).

Location:
main/trunk/greenstone2
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/config.h.in

    r10856 r21330  
    110110#undef USE_CORBA 
    111111 
     112/* Define ENABLE for indexers */ 
     113#undef ENABLE_MG 
     114#undef ENABLE_MGPP 
     115#undef ENABLE_LUCENE 
     116 
    112117/* Define MICO_DIR if needsbe */ 
    113118#undef MICO_DIR 
  • main/trunk/greenstone2/configure

    r20853 r21330  
    310310 
    311311ac_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' 
     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 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 
     
    860860  --disable-sqlite        Disable SQLite support 
    861861  --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 
    862865 
    863866Optional Packages: 
     
    13691372if test "${with_micodir+set}" = set; then 
    13701373  withval="$with_micodir" 
    1371   MICO_DIR=$enableval 
     1374  MICO_DIR=$withval 
    13721375else 
    13731376  MICO_DIR="default" 
     
    14441447_ACEOF 
    14451448 
     1449 
     1450 
     1451 
     1452# Check whether --enable-mg or --disable-mg was given. 
     1453if test "${enable_mg+set}" = set; then 
     1454  enableval="$enable_mg" 
     1455  ENABLE_MG=$enableval 
     1456else 
     1457  ENABLE_MG=yes 
     1458fi; 
     1459if 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. 
     1472if test "${enable_mgpp+set}" = set; then 
     1473  enableval="$enable_mgpp" 
     1474  ENABLE_MGPP=$enableval 
     1475else 
     1476  ENABLE_MGPP=yes 
     1477fi; 
     1478if 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 
     1484else 
     1485  ENABLE_MGPP=0 
     1486fi 
     1487 
     1488 
     1489# Check whether --enable-lucene or --disable-lucene was given. 
     1490if test "${enable_lucene+set}" = set; then 
     1491  enableval="$enable_lucene" 
     1492  ENABLE_LUCENE=$enableval 
     1493else 
     1494  ENABLE_LUCENE=yes 
     1495fi; 
     1496if 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 
     1502else 
     1503  ENABLE_LUCENE=0 
     1504fi 
    14461505 
    14471506 
     
    78617920s,@USE_SQLITE@,$USE_SQLITE,;t t 
    78627921s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t 
     7922s,@ENABLE_MG@,$ENABLE_MG,;t t 
     7923s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t 
     7924s,@ENABLE_LUCENE@,$ENABLE_LUCENE,;t t 
    78637925s,@LDFLAGS@,$LDFLAGS,;t t 
    78647926s,@CFLAGS@,$CFLAGS,;t t 
  • main/trunk/greenstone2/configure.in

    r20853 r21330  
    3838AC_SUBST(USE_CORBA) 
    3939 
    40 AC_ARG_WITH(micodir, [  --with-micodir          Use installed MICO directory], MICO_DIR=$enableval, MICO_DIR="default") 
     40AC_ARG_WITH(micodir, [  --with-micodir          Use installed MICO directory], MICO_DIR=$withval, MICO_DIR="default") 
    4141AC_DEFINE_UNQUOTED(MICO_DIR, "$MICO_DIR") 
    4242AC_SUBST(MICO_DIR) 
     
    8080AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD) 
    8181AC_SUBST(USE_APACHE_HTTPD) 
     82 
     83 
     84dnl 
     85dnl Set compilation of MG (enabled by default) 
     86dnl 
     87AC_ARG_ENABLE(mg, [  --disable-mg    Disable MG compilation], ENABLE_MG=$enableval, ENABLE_MG=yes) 
     88if 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 
     94AC_SUBST(ENABLE_MG) 
     95 
     96 
     97dnl 
     98dnl Set compilation of MGPP (enabled by default) 
     99dnl 
     100AC_ARG_ENABLE(mgpp, [  --disable-mgpp        Disable MGPP compilation], ENABLE_MGPP=$enableval, ENABLE_MGPP=yes) 
     101if test $ENABLE_MGPP = "yes" -o $ENABLE_MGPP = "1" ; then 
     102  ENABLE_MGPP=1 
     103  AC_DEFINE(ENABLE_MGPP,[]) 
     104else 
     105  ENABLE_MGPP=0 
     106fi 
     107AC_SUBST(ENABLE_MGPP) 
     108 
     109dnl 
     110dnl Set compilation of lucene (enabled by default) 
     111dnl 
     112AC_ARG_ENABLE(lucene, [  --disable-lucene        Disable Lucene compilation], ENABLE_LUCENE=$enableval, ENABLE_LUCENE=yes) 
     113if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then 
     114  ENABLE_LUCENE=1 
     115  AC_DEFINE(ENABLE_LUCENE, []) 
     116else 
     117  ENABLE_LUCENE=0 
     118fi 
     119AC_SUBST(ENABLE_LUCENE) 
    82120 
    83121 
  • main/trunk/greenstone2/win32.mak

    r19522 r21330  
    3636USE_Z3950 = 0 
    3737 
     38# by default, all indexers are enabled 
     39ENABLE_MG = 1 
     40ENABLE_MGPP = 1 
     41ENABLE_LUCENE = 1 
     42 
     43 
    3844MDEFINES = /f win32.mak 
    3945 
     
    6167MAKECMD = $(MAKECMD) DLLDEBUG=1 
    6268!ENDIF 
    63 !IF $(USE_SQLITE) 
     69!IF "$(USE_SQLITE)" == "" 
    6470MAKECMD = $(MAKECMD) USE_SQLITE=1 
     71!ELSE 
     72MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE) 
    6573!ENDIF 
    6674!IF $(USE_MSSQL) 
     
    6977!IF $(USE_Z3950) 
    7078MAKECMD = $(MAKECMD) USE_Z3950=1 
     79!ENDIF 
     80!IF "$(ENABLE_MG)" == "" 
     81MAKECMD = $(MAKECMD) ENABLE_MG=1 
     82!ELSE 
     83MAKECMD = $(MAKECMD) ENABLE_MG=$(ENABLE_MG) 
     84!ENDIF 
     85!IF "$(ENABLE_MGPP)" == "" 
     86MAKECMD = $(MAKECMD) ENABLE_MGPP=1 
     87!ELSE 
     88MAKECMD = $(MAKECMD) ENABLE_MGPP=$(ENABLE_MGPP) 
     89!ENDIF 
     90!IF "$(ENABLE_LUCENE)" == "" 
     91MAKECMD = $(MAKECMD) ENABLE_LUCENE=1 
     92!ELSE 
     93MAKECMD = $(MAKECMD) ENABLE_LUCENE=$(ENABLE_LUCENE) 
    7194!ENDIF 
    7295