Ignore:
Timestamp:
2010-01-19T16:15:18+13:00 (14 years ago)
Author:
mdewsnip
Message:

Added --disable-lucene option to configure scripts, and make Lucene enabled by default. ENABLE_LUCENE is defined for use in the C++ code and Makefiles.

Location:
main/trunk/gs2-core/runtime-src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/gs2-core/runtime-src/Makefile.in

    r21505 r21534  
    120120ECHO_N = @ECHO_N@
    121121ECHO_T = @ECHO_T@
     122ENABLE_LUCENE_FALSE = @ENABLE_LUCENE_FALSE@
     123ENABLE_LUCENE_TRUE = @ENABLE_LUCENE_TRUE@
    122124EXEEXT = @EXEEXT@
    123125INSTALL_DATA = @INSTALL_DATA@

  • main/trunk/gs2-core/runtime-src/config.h.in

    r21494 r21534  
    11/* config.h.in.  Generated from configure.ac by autoheader.  */
     2
     3/* Lucene support */
     4#undef ENABLE_LUCENE
    25
    36/* Define to 1 if you have the `crypt' library (-lcrypt). */

  • main/trunk/gs2-core/runtime-src/configure

    r21519 r21534  
    274274PACKAGE_BUGREPORT='[email protected]'
    275275
    276 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os COMPAT32BITFLAGS USE_SQLITE_TRUE USE_SQLITE_FALSE LIBOBJS LTLIBOBJS'
     276ac_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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os COMPAT32BITFLAGS ENABLE_LUCENE_TRUE ENABLE_LUCENE_FALSE USE_SQLITE_TRUE USE_SQLITE_FALSE LIBOBJS LTLIBOBJS'
    277277ac_subst_files=''
    278278
    … …  
    822822  --disable-dependency-tracking  speeds up one-time build
    823823  --enable-dependency-tracking   do not reject slow dependency extractors
     824  --disable-lucene        Disable Lucene support
    824825  --disable-sqlite        Disable SQLite support
    825826
    … …  
    35883589
    35893590
     3591# Option: Lucene support (enabled by default)
     3592# Check whether --enable-lucene or --disable-lucene was given.
     3593if test "${enable_lucene+set}" = set; then
     3594  enableval="$enable_lucene"
     3595
     3596else
     3597  enable_lucene=yes
     3598fi;
     3599if test "x$enable_lucene" != xno; then
     3600
     3601cat >>confdefs.h <<\_ACEOF
     3602#define ENABLE_LUCENE 1
     3603_ACEOF
     3604
     3605fi
     3606
     3607
     3608if test "x$enable_lucene" != xno; then
     3609  ENABLE_LUCENE_TRUE=
     3610  ENABLE_LUCENE_FALSE='#'
     3611else
     3612  ENABLE_LUCENE_TRUE='#'
     3613  ENABLE_LUCENE_FALSE=
     3614fi
     3615
     3616
    35903617# Option: SQLite support (enabled by default)
    35913618# Check whether --enable-sqlite or --disable-sqlite was given.
    … …  
    37253752Usually this means the macro was only invoked conditionally." >&5
    37263753echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
     3754Usually this means the macro was only invoked conditionally." >&2;}
     3755   { (exit 1); exit 1; }; }
     3756fi
     3757if test -z "${ENABLE_LUCENE_TRUE}" && test -z "${ENABLE_LUCENE_FALSE}"; then
     3758  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_LUCENE\" was never defined.
     3759Usually this means the macro was only invoked conditionally." >&5
     3760echo "$as_me: error: conditional \"ENABLE_LUCENE\" was never defined.
    37273761Usually this means the macro was only invoked conditionally." >&2;}
    37283762   { (exit 1); exit 1; }; }
    … …  
    43264360s,@host_os@,$host_os,;t t
    43274361s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t
     4362s,@ENABLE_LUCENE_TRUE@,$ENABLE_LUCENE_TRUE,;t t
     4363s,@ENABLE_LUCENE_FALSE@,$ENABLE_LUCENE_FALSE,;t t
    43284364s,@USE_SQLITE_TRUE@,$USE_SQLITE_TRUE,;t t
    43294365s,@USE_SQLITE_FALSE@,$USE_SQLITE_FALSE,;t t

  • main/trunk/gs2-core/runtime-src/configure.ac

    r21519 r21534  
    5656AC_SUBST(COMPAT32BITFLAGS)
    5757
     58# Option: Lucene support (enabled by default)
     59AC_ARG_ENABLE([lucene], [AS_HELP_STRING([--disable-lucene], [Disable Lucene support])], [], [enable_lucene=yes])
     60if test "x$enable_lucene" != xno; then
     61  AC_DEFINE(ENABLE_LUCENE, 1, [Lucene support])
     62fi
     63AM_CONDITIONAL(ENABLE_LUCENE, test "x$enable_lucene" != xno)
     64
    5865# Option: SQLite support (enabled by default)
    5966AC_ARG_ENABLE([sqlite], [AS_HELP_STRING([--disable-sqlite], [Disable SQLite support])], [], [enable_sqlite=yes])

  • main/trunk/gs2-core/runtime-src/src/colservr/Makefile.in

    r21494 r21534  
    136136ECHO_N = @ECHO_N@
    137137ECHO_T = @ECHO_T@
     138ENABLE_LUCENE_FALSE = @ENABLE_LUCENE_FALSE@
     139ENABLE_LUCENE_TRUE = @ENABLE_LUCENE_TRUE@
    138140EXEEXT = @EXEEXT@
    139141INSTALL_DATA = @INSTALL_DATA@

  • main/trunk/gs2-core/runtime-src/src/oaiservr/Makefile.in

    r21502 r21534  
    142142ECHO_N = @ECHO_N@
    143143ECHO_T = @ECHO_T@
     144ENABLE_LUCENE_FALSE = @ENABLE_LUCENE_FALSE@
     145ENABLE_LUCENE_TRUE = @ENABLE_LUCENE_TRUE@
    144146EXEEXT = @EXEEXT@
    145147INSTALL_DATA = @INSTALL_DATA@

  • main/trunk/gs2-core/runtime-src/src/protocol/Makefile.in

    r21494 r21534  
    116116ECHO_N = @ECHO_N@
    117117ECHO_T = @ECHO_T@
     118ENABLE_LUCENE_FALSE = @ENABLE_LUCENE_FALSE@
     119ENABLE_LUCENE_TRUE = @ENABLE_LUCENE_TRUE@
    118120EXEEXT = @EXEEXT@
    119121INSTALL_DATA = @INSTALL_DATA@

  • main/trunk/gs2-core/runtime-src/src/recpt/Makefile.in

    r21491 r21534  
    161161ECHO_N = @ECHO_N@
    162162ECHO_T = @ECHO_T@
     163ENABLE_LUCENE_FALSE = @ENABLE_LUCENE_FALSE@
     164ENABLE_LUCENE_TRUE = @ENABLE_LUCENE_TRUE@
    163165EXEEXT = @EXEEXT@
    164166INSTALL_DATA = @INSTALL_DATA@
Note: See TracChangeset for help on using the changeset viewer.