Changeset 21329


Ignore:
Timestamp:
12/09/09 21:50:53 (11 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/runtime-src
Files:
4 edited

Legend:

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

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

    r20854 r21329  
    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 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:
     
    14471450
    14481451
     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
     1465else
     1466  ENABLE_MG=0
     1467fi
     1468
     1469
     1470# Check whether --enable-mgpp or --disable-mgpp was given.
     1471if test "${enable_mgpp+set}" = set; then
     1472  enableval="$enable_mgpp"
     1473  ENABLE_MGPP=$enableval
     1474else
     1475  ENABLE_MGPP=yes
     1476fi;
     1477if 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
     1483else
     1484  ENABLE_MGPP=0
     1485fi
     1486
     1487
     1488# Check whether --enable-lucene or --disable-lucene was given.
     1489if test "${enable_lucene+set}" = set; then
     1490  enableval="$enable_lucene"
     1491  ENABLE_LUCENE=$enableval
     1492else
     1493  ENABLE_LUCENE=yes
     1494fi;
     1495if 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
     1501else
     1502  ENABLE_LUCENE=0
     1503fi
     1504
    14491505
    14501506LDFLAGS=$LDFLAGS
     
    78437899s,@USE_SQLITE@,$USE_SQLITE,;t t
    78447900s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t
     7901s,@ENABLE_MG@,$ENABLE_MG,;t t
     7902s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t
     7903s,@ENABLE_LUCENE@,$ENABLE_LUCENE,;t t
    78457904s,@LDFLAGS@,$LDFLAGS,;t t
    78467905s,@CFLAGS@,$CFLAGS,;t t
  • main/trunk/greenstone2/runtime-src/configure.in

    r20853 r21329  
    8282AC_SUBST(USE_APACHE_HTTPD)
    8383
     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,[])
     91else
     92  ENABLE_MG=0
     93fi
     94AC_SUBST(ENABLE_MG)
     95
     96dnl
     97dnl Set compilation of MGPP (enabled by default)
     98dnl
     99AC_ARG_ENABLE(mgpp, [  --disable-mgpp        Disable MGPP compilation], ENABLE_MGPP=$enableval, ENABLE_MGPP=yes)
     100if test $ENABLE_MGPP = "yes" -o $ENABLE_MGPP = "1" ; then
     101  ENABLE_MGPP=1
     102  AC_DEFINE(ENABLE_MGPP,[])
     103else
     104  ENABLE_MGPP=0
     105fi
     106AC_SUBST(ENABLE_MGPP)
     107
     108dnl
     109dnl Set compilation of lucene (enabled by default)
     110dnl
     111AC_ARG_ENABLE(lucene, [  --disable-lucene        Disable Lucene compilation], ENABLE_LUCENE=$enableval, ENABLE_LUCENE=yes)
     112if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then
     113  ENABLE_LUCENE=1
     114  AC_DEFINE(ENABLE_LUCENE,[])
     115else
     116  ENABLE_LUCENE=0
     117fi
     118AC_SUBST(ENABLE_LUCENE)
    84119
    85120dnl Checks for programs.
  • main/trunk/greenstone2/runtime-src/win32.mak

    r20430 r21329  
    3737USE_MSSQL = 0
    3838USE_Z3950 = 0
     39ENABLE_MG = 1
     40ENABLE_MGPP = 1
     41ENABLE_LUCENE = 1
    3942
    4043MDEFINES = /f win32.mak
     
    6972MAKECMD = $(MAKECMD) DLLDEBUG=1
    7073!ENDIF
    71 !IF $(USE_SQLITE)
     74!IF "$(USE_SQLITE)" == ""
    7275MAKECMD = $(MAKECMD) USE_SQLITE=1
     76!ELSE
     77MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE)
    7378!ENDIF
    7479!IF $(USE_MSSQL)
     
    7984INSTALLDIRS = src\z3950 $(INSTALLDIRS)
    8085PACKAGEDIRS = $(PACKAGEDIRS) packages\d2m $(YAZ_DIR)
     86!ENDIF
     87!IF "$(ENABLE_MG)" == ""
     88MAKECMD = $(MAKECMD) ENABLE_MG=1
     89!ELSE
     90MAKECMD = $(MAKECMD) ENABLE_MG=$(ENABLE_MG)
     91!ENDIF
     92!IF "$(ENABLE_MGPP)" == ""
     93MAKECMD = $(MAKECMD) ENABLE_MGPP=1
     94!ELSE
     95MAKECMD = $(MAKECMD) ENABLE_MGPP=$(ENABLE_MGPP)
     96!ENDIF
     97!IF "$(ENABLE_LUCENE)" == ""
     98MAKECMD = $(MAKECMD) ENABLE_LUCENE=1
     99!ELSE
     100MAKECMD = $(MAKECMD) ENABLE_LUCENE=$(ENABLE_LUCENE)
    81101!ENDIF
    82102
Note: See TracChangeset for help on using the changeset viewer.